aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-18 11:55:53 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-02-18 11:55:53 +0100
commitbe02dd105b7803b7b2b6942f9d254539dfd6ba26 (patch)
treefa30e4f6edadbc8a369a2969007a299de53ad766
parentbf024cd15320119e341cdf9bf0fd4d69df233c64 (diff)
parent3cbacf4e0bae8cd96752303b42f88e176e638824 (diff)
downloadmitmproxy-be02dd105b7803b7b2b6942f9d254539dfd6ba26.tar.gz
mitmproxy-be02dd105b7803b7b2b6942f9d254539dfd6ba26.tar.bz2
mitmproxy-be02dd105b7803b7b2b6942f9d254539dfd6ba26.zip
Merge pull request #962 from mitmproxy/simpler-issue-template
Simplify Issue Template
-rw-r--r--README.rst23
-rw-r--r--issue_template.md21
2 files changed, 6 insertions, 38 deletions
diff --git a/README.rst b/README.rst
index d816a763..78e99c34 100644
--- a/README.rst
+++ b/README.rst
@@ -100,29 +100,6 @@ The last command invokes `sphinx-autobuild`_, which watches the Sphinx directory
the documentation when a change is detected.
-Contributing
-----
-
-Thank you for your interest in contributing to mitmproxy!
-
-* Bug Reports
-
-Bug Reports are very welcome - please file them on the GitHub issue_tracker_.
-Please make sure to fill out the template and provide as much information as
-possible.
-
-* Feature Requests
-
-We're happy to hear what you'd like to see in mitmproxy. Please file feature
-requests on the GitHub issue_tracker_.
-
-* Patches
-
-We're always happy to accept patches. Please submit them in the form of pull
-requests to the this repository. If you're working on something cool, please do
-not hesitate and get in touch!
-
-
.. |mitmproxy_site| image:: https://shields.mitmproxy.org/api/https%3A%2F%2F-mitmproxy.org-blue.svg
:target: https://mitmproxy.org/
diff --git a/issue_template.md b/issue_template.md
index 01b736be..3f9be788 100644
--- a/issue_template.md
+++ b/issue_template.md
@@ -1,28 +1,19 @@
##### Steps to reproduce the problem:
-1. Launch mitmproxy
-2. Press X
-3. Click Y
+
+1.
+2.
+3.
##### What is the expected behavior?
-It should display Z.
##### What went wrong?
-It crashed with this error/trace: ...
##### Any other comments?
-None.
---
-mitmproxy version: (e.g.: 0.16, git commit hash)
-
-mitmproxy installed from: (e.g.: pip, binary package, source)
-
-Operating System: (e.g.: Windows, OSX, Linux, with specific version)
-
-OpenSSL version: (e.g.: 1.0.2f, run `openssl version` in your shell)
-
-pyOpenSSL version: (e.g.: 0.15.1, run `import OpenSSL; print(OpenSSL.__version__)` in Python)
+Mitmproxy Version:
+Operating System: \ No newline at end of file