diff options
author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
---|---|---|
committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /doc | |
parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip |
fix conflict
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer/code-contribution.md | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/doc/developer/code-contribution.md b/doc/developer/code-contribution.md index c796a82a5..708b324a0 100644 --- a/doc/developer/code-contribution.md +++ b/doc/developer/code-contribution.md @@ -31,7 +31,26 @@ 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 @[GITHUB_USERNAME] for the pull request! + +Before we can review, we need to add you to the list of approved contributors for the Mattermost project. + +**Please help complete the Mattermost [contribution license agreement](http://www.mattermost.org/mattermost-contributor-agreement/)?** + +This is a standard procedure for many open source projects. You can view a list of past contributors who have completed the form [here](https://docs.google.com/spreadsheets/d/1NTCeG-iL_VS9bFqtmHSfwETo5f-8MQ7oMDE5IUYJi_Y/pubhtml?gid=0&single=true). + +After completing the form, it should be processed within 24 hours and reviewers for your pull request will be able to proceed. + +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. |