diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-05-27 13:28:47 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-05-27 13:28:47 +0200 |
| commit | be5ea2170645b6d776623fba4269fba2e6aa5c9b (patch) | |
| tree | d93b9a3808d3654c1887659c5c881aee2c5ce5ff | |
| parent | e5784500770766fdac889f01a2dd82120b8a681b (diff) | |
| parent | 191b80a750e767388eb39192508eb1341a6c07a9 (diff) | |
| download | forums-be5ea2170645b6d776623fba4269fba2e6aa5c9b.tar forums-be5ea2170645b6d776623fba4269fba2e6aa5c9b.tar.gz forums-be5ea2170645b6d776623fba4269fba2e6aa5c9b.tar.bz2 forums-be5ea2170645b6d776623fba4269fba2e6aa5c9b.tar.xz forums-be5ea2170645b6d776623fba4269fba2e6aa5c9b.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14650] Semi-colon instead of slash to make Matt happy
[ticket/14650] Move CONTRIBUTING.md and add pull request template
| -rw-r--r-- | .github/CONTRIBUTING.md (renamed from CONTRIBUTING.md) | 0 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 10 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3fceabda10..3fceabda10 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..39eb83e454 --- /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 |