From fabff3846339e29514bb66503b0775f79b33cc87 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 09:04:04 -0700 Subject: Clarifying PRs should go to master --- doc/developer/Code-Contribution-Guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md index 453c154f9..7a293f8bf 100644 --- a/doc/developer/Code-Contribution-Guidelines.md +++ b/doc/developer/Code-Contribution-Guidelines.md @@ -35,7 +35,7 @@ git checkout -b 1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). -2. When you submit your pull request please include the Ticket ID at the beginning of your pull request comment, followed by a colon. +2. When you submit your pull request please make it again `master` and include the Ticket ID at the beginning of your pull request comment, followed by a colon. For example, for a ticket ID `PLT-394` start your comment with: `PLT-394:`. See [previously closed pull requests](https://github.com/mattermost/platform/pulls?q=is%3Apr+is%3Aclosed) for examples. -- cgit v1.2.3-1-g7c22 From ee85f6512f927e74cd01114c3806c887e0ccb639 Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 09:06:27 -0700 Subject: Update Code-Contribution-Guidelines.md --- doc/developer/Code-Contribution-Guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md index 7a293f8bf..1e5028761 100644 --- a/doc/developer/Code-Contribution-Guidelines.md +++ b/doc/developer/Code-Contribution-Guidelines.md @@ -39,7 +39,7 @@ git checkout -b For example, for a ticket ID `PLT-394` start your comment with: `PLT-394:`. See [previously closed pull requests](https://github.com/mattermost/platform/pulls?q=is%3Apr+is%3Aclosed) for examples. -3. Once submitted, your pull request will be checked via an automated build process and will be reviewed by the Mattermost core team, who may either accept the PR or follow-up with feedback. +3. Once submitted, your pull request will be checked via an automated build process and will be reviewed by at least two members of the Mattermost core team, who may either accept the PR or follow-up with feedback. It would then get merged into `master` for the next release. 4. If you've included your mailing address in Step 1, you'll be receiving a [Limited Edition Mattermost Mug](http://forum.mattermost.org/t/limited-edition-mattermost-mugs/143) as a thank you gift after your first pull request has been accepted. -- cgit v1.2.3-1-g7c22 From 8f5a73705cbf2fd5773d7a4f74cc12f5d6f0f1bb Mon Sep 17 00:00:00 2001 From: it33 Date: Tue, 13 Oct 2015 13:32:57 -0700 Subject: Update Code-Contribution-Guidelines.md --- doc/developer/Code-Contribution-Guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developer/Code-Contribution-Guidelines.md b/doc/developer/Code-Contribution-Guidelines.md index 1e5028761..48bbf2491 100644 --- a/doc/developer/Code-Contribution-Guidelines.md +++ b/doc/developer/Code-Contribution-Guidelines.md @@ -35,7 +35,7 @@ git checkout -b 1. Please add yourself to the Mattermost [approved contributor list](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true) prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/). -2. When you submit your pull request please make it again `master` and include the Ticket ID at the beginning of your pull request comment, followed by a colon. +2. When you submit your pull request please make it against `master` and include the Ticket ID at the beginning of your pull request comment, followed by a colon. For example, for a ticket ID `PLT-394` start your comment with: `PLT-394:`. See [previously closed pull requests](https://github.com/mattermost/platform/pulls?q=is%3Apr+is%3Aclosed) for examples. -- cgit v1.2.3-1-g7c22