summaryrefslogtreecommitdiffstats
path: root/doc/developer/code-contribution.md
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-18 09:19:53 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-18 09:19:53 -0700
commit1aa4913c44ba9a342d240e5e1ca9d5e89929e499 (patch)
treecc27224146e8c496e07c3aa4028f69c64d5b712b /doc/developer/code-contribution.md
parent60af1fad1f4f88dbfbda58336711d3184e57a1e4 (diff)
parent6eb32591d978240fb77696f0b8697e81832883bb (diff)
downloadchat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.tar.gz
chat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.tar.bz2
chat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.zip
fixing merge
Diffstat (limited to 'doc/developer/code-contribution.md')
-rw-r--r--doc/developer/code-contribution.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/developer/code-contribution.md b/doc/developer/code-contribution.md
index c796a82a5..e9b088beb 100644
--- a/doc/developer/code-contribution.md
+++ b/doc/developer/code-contribution.md
@@ -31,7 +31,12 @@ git checkout -b <branch name>
## Submitting a Pull Request
-1. Please add yourself to the contributor list prior to submitting by completing the [contributor license agreement](http://www.mattermost.org/mattermost-contributor-agreement/).
+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/).
+
+ For pull requests made by contributors not yet added to the approved contributor list, a reviewer may respond:
+
+ ```Thanks @[username] for the pull request! Before we can review, we need to add you to the list of [approved contributors](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/), which is a standard procedure for many open source projects. More information is in the above link. Please let us know if you have any questions. We are very happy to have you join our growing community!```
+
2. When you submit your pull request please include the Ticket ID at the beginning of your pull request comment, followed by a colon.