From a8fb33218c3351ab51c3f8ba88ed8ba1b1484647 Mon Sep 17 00:00:00 2001 From: Marc Alexander <admin@m-a-styles.de> Date: Thu, 26 May 2016 18:34:55 +0200 Subject: [PATCH 1/2] [ticket/14650] Move CONTRIBUTING.md and add pull request template PHPBB3-14650 --- CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++++ 2 files changed, 10 insertions(+) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..e25eef9ad4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,10 @@ +Checklist: + +- [ ] Correct branch: master for new features / 3.2.x, 3.1.x for fixes +- [ ] Tests pass +- [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html) +- [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages) + +Tracker ticket (set the ticket ID to **your ticket ID**): + +https://tracker.phpbb.com/browse/PHPBB3-12345 From dcf90a8d8ba6bd143aa02a18634ce17d7e23cce5 Mon Sep 17 00:00:00 2001 From: Marc Alexander <admin@m-a-styles.de> Date: Thu, 26 May 2016 18:46:34 +0200 Subject: [PATCH 2/2] [ticket/14650] Semi-colon instead of slash to make Matt happy PHPBB3-14650 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e25eef9ad4..39eb83e454 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ Checklist: -- [ ] Correct branch: master for new features / 3.2.x, 3.1.x for fixes +- [ ] Correct branch: master for new features; 3.2.x, 3.1.x for fixes - [ ] Tests pass - [ ] Code follows coding guidelines: [master / 3.2.x](https://area51.phpbb.com/docs/master/coding-guidelines.html), [3.1.x](https://area51.phpbb.com/docs/31x/coding-guidelines.html) - [ ] Commit follows commit message [format](https://wiki.phpbb.com/Git#Commit_Messages)