From bae1c8d955389e3cf42f4036e9495f5ad624fdb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 23 Aug 2018 01:42:52 -0300 Subject: [PATCH] Update GitHub templates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add support for multiple issue templates - Update pull request template Based on https://help.github.com/articles/creating-issue-templates-for-your-repository/ [CI skip] Signed-off-by: Maurício Meneghini Fauth --- .github/ISSUE_TEMPLATE.md | 26 -------------- .github/ISSUE_TEMPLATE/bug_report.md | 42 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 23 +++++++++++++ .github/ISSUE_TEMPLATE/security_report.md | 11 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 18 +++++++--- 5 files changed, 89 insertions(+), 31 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/security_report.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index db0ed3b2c0..0000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,26 +0,0 @@ -### Steps to reproduce -1. -2. -3. - -### Expected behaviour -Tell us what should happen - -### Actual behaviour -Tell us what happens instead - -### Server configuration -**Operating system**: - -**Web server:** - -**Database:** - -**PHP version:** - -**phpMyAdmin version:** - -### Client configuration -**Browser:** - -**Operating system:** diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000000..c2d5659e82 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,42 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +### Describe the bug + +A clear and concise description of what the bug is. + +### To Reproduce + +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +### Expected behavior + +A clear and concise description of what you expected to happen. + +### Screenshots + +If applicable, add screenshots to help explain your problem. + +### Server configuration + +- Operating system: +- Web server: +- Database version: +- PHP version: +- phpMyAdmin version: + +### Client configuration + +- Browser: +- Operating system: + +### Additional context + +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000000..9cb1d01e76 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,23 @@ +--- +name: Feature request +about: Suggest an idea for phpMyAdmin + +--- + +### 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 solution you'd like + +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. + +### Additional context + +- phpMyAdmin version: + +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/security_report.md b/.github/ISSUE_TEMPLATE/security_report.md new file mode 100644 index 0000000000..0fe7c692b6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/security_report.md @@ -0,0 +1,11 @@ +--- +name: Security report +about: Disclose a security vulnerability responsibly by first reporting it to us privately + +--- + +Security problems should not be reported here. + +See our security page: https://www.phpmyadmin.net/security/ + +Thanks for your help! diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3c47317f09..bc6e3381a8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,14 @@ -Before submitting pull request, please check that every commit: +### Description -- [ ] Has proper Signed-Off-By -- [ ] Has commit message which describes it -- [ ] Is needed on it's own, if you have just minor fixes to previous commits, you can squash them -- [ ] Any new functionality is covered by tests +Please describe your pull request. + +Fixes # + +Before submitting pull request, please review the following checklist: + +- [ ] Make sure you have read our [CONTRIBUTING.md](https://github.com/phpmyadmin/phpmyadmin/blob/master/CONTRIBUTING.md) document. +- [ ] Make sure you are making a pull request against the correct branch. For example, for bug fixes in a released version use the corresponding QA branch and for new features use the _master_ branch. If you have a doubt, you can ask as a comment in the bug report or on the mailing list. +- [ ] Every commit has proper `Signed-off-by` line as described in our [DCO](https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO). This ensures that the work you're submitting is your own creation. +- [ ] Every commit has a descriptive commit message. +- [ ] Every commit is needed on its own, if you have just minor fixes to previous commits, you can squash them. +- [ ] Any new functionality is covered by tests.