.github: add refine feature_request and add security templates

[SKIP CI]

5 files changed, 36 insertions, 45 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index ffad3525..00000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-The issue will be closed without any reasons if it does not satisfy any of following requirements:
-
-1. Please speak English, we have forum in [中文](https://discuss.gogs.io/c/getting-help/getting-help-chinese).
-2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only.
-3. Please do not end your title with a question mark or period.
-3. Please take a moment to search that an issue doesn't already exist.
-4. Please give all relevant information below for bug reports; incomplete details considered invalid report.
-
-**You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.**
-
-- Gogs version (or commit ref): 
-- Git version: 
-- Operating system: 
-- Database (use `[x]`):
-  - [ ] PostgreSQL
-  - [ ] MySQL
-  - [ ] MSSQL
-  - [ ] SQLite
-- Can you reproduce the bug at https://try.gogs.io:
-  - [ ] Yes: provide example URL
-  - [ ] No: explain why
-- Log gist (usually found in `log/gogs.log`):
-
-## Description
-
-...
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7035633c..1dd022c3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ The issue will be closed without any explanation if it does not satisfy any of f
 -->
 
 **Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
+<!-- A clear and concise description of what the bug is -->
 
 **Gogs version or commit**
 <!-- The version number or the commit SHA of the Gogs instance you use -->
@@ -46,16 +46,17 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-<!-- Use [x] to check the box -->
-Can you reproduce the bug at https://try.gogs.io:
-    - [ ] Yes: <!-- provide example URL -->
-    - [ ] No: <!-- explain why below -->
+**Can you reproduce the bug at https://try.gogs.io?**
+<!-- If yes, please provide the example URL; if no, please explain why -->
 
 **Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
+<!-- A clear and concise description of what you expected to happen -->
+
+**Actual behavior**
+<!-- A clear and concise description of what you see instead -->
 
 **Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
+<!-- If applicable, add screenshots to help explain your problem -->
 
 **Additional context**
 <!-- Please include any error logs found in `log/gogs.log` -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 6133da31..95f992aa 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,23 +4,29 @@ about: Suggest an idea for this project
 
 ---
 
+<!--
+
+First of all, please read https://www.chiark.greenend.org.uk/~sgtatham/bugs.html.
+
+If you don't want to read, it's up to you. But don't waste your time continue reporting.
+
 The issue will be closed without any explanation if it does not satisfy any of following requirements:
 
-1. Please speak English, we have forum in [中文](https://discuss.gogs.io/c/getting-help/getting-help-chinese).
-2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only.
+1. Please speak English, we have forum in 中文: https://discuss.gogs.io/c/getting-help/getting-help-chinese.
+2. Please post any questions, configuration or deploy problems on our forum: https://discuss.gogs.io.
 3. Please do not end your title with a question mark or period.
-4. Please take a moment to search that an issue doesn't already exist.
+4. Please take a moment to search and make sure the issue doesn't already exist.
 
-**You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.**
+-->
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Describe the feature**
+<!-- A description of what feature you would like -->
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen -->
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here -->
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
new file mode 100644
index 00000000..6a8ac10f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -0,0 +1,12 @@
+---
+name: Security vulnerability
+about: Report security vulnerability for this project
+
+---
+
+<!--
+
+Please create a dummy issue with high-level description of the security vulnerability,
+then report details to u@gogs.io privately, thank you!
+
+-->
diff --git a/README.md b/README.md
index 5265d601..f2ee032a 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,7 @@
 1. **YOU MUST READ [Contributing Code](https://github.com/gogs/gogs/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
 2. Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
 3. The demo site [try.gogs.io](https://try.gogs.io) is running under `master` branch.
-4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**, and the name you want to be credited as. Thanks!
-5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogs/go-gogs-client/wiki).
-6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.
+4. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogs/go-gogs-client/wiki).
 
 [简体中文](README_ZH.md)