From 2ccf063dfeb2606bdd34c224b7967efb59487b7d Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Sat, 22 Jul 2017 15:15:39 +1000 Subject: [PATCH 1/6] Update Issue Template text --- .github/ISSUE_TEMPLATE.md | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 23e67795..185539ec 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,33 +1,36 @@ -**In raising this issue, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your issue:** +**In raising this issue, I confirm the following:** `{please fill the checkboxes, e.g: [X]}` - [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). -- [] The issue I am reporting can be *replicated* +- [] The issue I am reporting can be *replicated*. - [] The issue I am reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/pi-hole/issues)). -**How familiar are you with the codebase?:** +**How familiar are you with the the source code relevant to this issue?:** -_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_ +`{Replace this with a number from 1 to 10. 1 being not familiar, and 10 being very familiar}` --- -**[BUG REPORT | OTHER]:** +**Expected behaviour:** -Please [submit your feature request here](https://discourse.pi-hole.net/c/feature-requests), so it is votable by the community. It's also easier for us to track. +`{A detailed description of what you expect to see}` -**[BUG | ISSUE] Expected Behaviour:** +**Actual behaviour:** +`{A detailed description and/or screenshots of what you do see}` -**[BUG | ISSUE] Actual Behaviour:** +**Steps to reproduce:** +`{Detailed steps of how we can reproduce this}` -**[BUG | ISSUE] Steps to reproduce:** +**Debug token provided by [uploading `pihole -d` log](https://pi-hole.net/2016/11/07/crack-our-medical-tricorder-win-a-raspberry-pi-3/):** -- -- -- -- +`{Alphanumeric token}` -**(Optional) Debug token generated by `pihole -d`:** +**Troubleshooting undertaken, and/or other relevant information:** -`` +`{Steps of what you have done to fix this}` -_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ +> * `{Please delete this quoted section when opening your issue}` +> * You must follow the template instructions. Failure to do so will result in your issue being closed. +> * Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time. +> * Detail helps us understand and resolve an issue quicker, but please ensure it's relevant. +> * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ From 291c111ce8fd3f056bc5c5fef3e7b86e836448cf Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Sat, 22 Jul 2017 15:29:36 +1000 Subject: [PATCH 2/6] Update PR Template text Signed-off-by: WaLLy3K --- .github/PULL_REQUEST_TEMPLATE.md | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8583806b..aefe5bea 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,19 +1,32 @@ -**By submitting this pull request, I confirm the following (please check boxes, eg [X]) _Failure to fill the template will close your PR_:** +**By submitting this pull request, I confirm the following:** `{please fill the checkboxes, e.g: [X]}` -***Please submit all pull requests against the `development` branch. Failure to do so will delay or deny your request*** +`{Please ensure that your pull request is for the 'development' branch!}` - [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). -- [] I have written tests and verified that they fail without my change. +- [] I have performed relevant testing to verify that they work with my change. - [] I have squashed any insignificant commits. - [] This change has comments for package types, values, functions, and non-obvious lines of code. - [] I am willing to help maintain this change if there are issues with it later. -- [] I give this submission freely and claim no ownership. It is compatible with the EUPL 1.2 license. -- [] I have Signed Off all commits. (`git commit --signoff`) +- [] I give this submission freely and claim no ownership. +- [] It is compatible with the EUPL 1.2 license. +- [] I have Signed Off all commits. ([`git commit --signoff`](https://git-scm.com/docs/git-commit#git-commit---signoff)) -***Please explain what you have done and wish to accomplish with this Pull Request*** +--- -1. What does this change do, exactly? +**What does this PR aim to fix?:** -2. Please link to the relevant issues. +`{A detailed description and/or screenshots of the issue, and links to any relevant GitHub issues}` -3. Which documentation changes (if any) need to be made because of this PR? +**How does this PR fix the issue?:** + +`{A detailed description and/or screenshots of the implemented fix}` + +**What documentation changes (if any) are needed to support this PR?:** + +`{A detailed list of any necessary changes}` + +> * `{Please delete this quoted section when opening your pull request}` +> * You must follow the template instructions. Failure to do so will result in your issue being closed. +> * Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time. +> * Detail helps us understand an issue quicker, but please ensure it's relevant. +> * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._' From eead2f059b5dc14662b5179aee08b0bc448815cb Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Sun, 23 Jul 2017 11:06:43 +1000 Subject: [PATCH 3/6] Add review suggestions to Issue Template * Use a more relevant link when explaining debug * Re-add feature request note --- .github/ISSUE_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 185539ec..4a9c585a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -21,7 +21,7 @@ `{Detailed steps of how we can reproduce this}` -**Debug token provided by [uploading `pihole -d` log](https://pi-hole.net/2016/11/07/crack-our-medical-tricorder-win-a-raspberry-pi-3/):** +**Debug token provided by [uploading `pihole -d` log](https://discourse.pi-hole.net/t/the-pihole-command-with-examples/738#debug):** `{Alphanumeric token}` @@ -31,6 +31,7 @@ > * `{Please delete this quoted section when opening your issue}` > * You must follow the template instructions. Failure to do so will result in your issue being closed. +> * Please [submit any feature requests here](https://discourse.pi-hole.net/c/feature-requests), so it is votable and trackable by the community. > * Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time. > * Detail helps us understand and resolve an issue quicker, but please ensure it's relevant. > * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ From 7311db3a637e23a2c4fc57d5e20bdd4a1fef4103 Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Mon, 28 Aug 2017 13:28:23 +1000 Subject: [PATCH 4/6] Change wording to support feature PR's * Also clarify template suggestion text * Remove stray ' --- .github/PULL_REQUEST_TEMPLATE.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index aefe5bea..fc719223 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -**By submitting this pull request, I confirm the following:** `{please fill the checkboxes, e.g: [X]}` +**By submitting this pull request, I confirm the following:** `{please fill any appropriate checkboxes, e.g: [X]}` `{Please ensure that your pull request is for the 'development' branch!}` @@ -13,13 +13,13 @@ --- -**What does this PR aim to fix?:** +**What does this PR aim to accomplish?:** -`{A detailed description and/or screenshots of the issue, and links to any relevant GitHub issues}` +`{A detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues}` -**How does this PR fix the issue?:** +**How does this PR accomplish the above?:** -`{A detailed description and/or screenshots of the implemented fix}` +`{A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix}` **What documentation changes (if any) are needed to support this PR?:** @@ -29,4 +29,4 @@ > * You must follow the template instructions. Failure to do so will result in your issue being closed. > * Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time. > * Detail helps us understand an issue quicker, but please ensure it's relevant. -> * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._' +> * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ From ea1aad977472dfa4abe58d5e75e6a07199701af7 Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Fri, 1 Sep 2017 10:17:08 +1000 Subject: [PATCH 5/6] Add review suggestions to template --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index fc719223..9ac82474 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,13 +2,14 @@ `{Please ensure that your pull request is for the 'development' branch!}` -- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). -- [] I have performed relevant testing to verify that they work with my change. -- [] I have squashed any insignificant commits. -- [] This change has comments for package types, values, functions, and non-obvious lines of code. +- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template. +- [] I have made only one major change in my proposed changes. +- [] I have commented my proposed changes within the code. +- [] I have tested my proposed changes, and have included unit tests where possible. - [] I am willing to help maintain this change if there are issues with it later. - [] I give this submission freely and claim no ownership. - [] It is compatible with the EUPL 1.2 license. +- [] I have squashed any insignificant commits using [`git rebase`](https://git-scm.com/docs/git-rebase). - [] I have Signed Off all commits. ([`git commit --signoff`](https://git-scm.com/docs/git-commit#git-commit---signoff)) --- @@ -29,4 +30,3 @@ > * You must follow the template instructions. Failure to do so will result in your issue being closed. > * Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time. > * Detail helps us understand an issue quicker, but please ensure it's relevant. -> * _This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ From b354f722bec0402fa356163859ff2444cd9bceef Mon Sep 17 00:00:00 2001 From: WaLLy3K Date: Sat, 2 Sep 2017 21:52:54 +1000 Subject: [PATCH 6/6] Add link for EUPL * Also formatted `git rebase` text to be consistent with `git commit --signoff` Signed-off-by: WaLLy3K --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9ac82474..96ce4ba5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,8 +8,8 @@ - [] I have tested my proposed changes, and have included unit tests where possible. - [] I am willing to help maintain this change if there are issues with it later. - [] I give this submission freely and claim no ownership. -- [] It is compatible with the EUPL 1.2 license. -- [] I have squashed any insignificant commits using [`git rebase`](https://git-scm.com/docs/git-rebase). +- [] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1) +- [] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)) - [] I have Signed Off all commits. ([`git commit --signoff`](https://git-scm.com/docs/git-commit#git-commit---signoff)) ---