aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-05-26 18:34:55 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-05-26 18:34:55 +0200
commita8fb33218c3351ab51c3f8ba88ed8ba1b1484647 (patch)
tree96c7533a0de2339da2e3662f437e0b4f1ab537b0 /.github
parentMerge pull request #4314 from rmcgirr83/ticket_14624 (diff)
downloadphpbb-a8fb33218c3351ab51c3f8ba88ed8ba1b1484647.tar.gz
phpbb-a8fb33218c3351ab51c3f8ba88ed8ba1b1484647.tar.bz2
phpbb-a8fb33218c3351ab51c3f8ba88ed8ba1b1484647.zip
[ticket/14650] Move CONTRIBUTING.md and add pull request template
PHPBB3-14650
Diffstat (limited to '.github')
-rw-r--r--.github/CONTRIBUTING.md6
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md10
2 files changed, 16 insertions, 0 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 0000000000..3fceabda10
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,6 @@
+## CONTRIBUTE
+
+1. [Create an account on phpBB.com](http://www.phpbb.com/community/ucp.php?mode=register)
+2. [Create a ticket (unless there already is one)](http://tracker.phpbb.com/secure/CreateIssue!default.jspa)
+3. Read our [Coding guidelines](https://wiki.phpbb.com/Coding_guidelines) and [Git Contribution Guidelines](http://wiki.phpbb.com/Git)
+4. Send us a pull request
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