diff options
| author | Jason Blais <jason@spinpunch.com> | 2018-05-27 09:55:37 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-05-27 09:55:37 -0400 |
| commit | 05460ac3a709063e02f63ba4407828dff344b2cb (patch) | |
| tree | 1ae36d8ccf52f3b937ae23542ee78b10459870b3 /CONTRIBUTING.md | |
| parent | 58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962 (diff) | |
| download | chat-05460ac3a709063e02f63ba4407828dff344b2cb.tar.gz chat-05460ac3a709063e02f63ba4407828dff344b2cb.tar.bz2 chat-05460ac3a709063e02f63ba4407828dff344b2cb.zip | |
Update CONTRIBUTING.md (#8828)
* Update CONTRIBUTING.md
* Fix typo
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ac9356c2..af8fcfc8f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Code Contribution Guidelines -Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html) which describes the process for making code contributions across Mattermost projects. +Thank you for your interest in contributing! Please see the [Mattermost Contribution Guide](http://docs.mattermost.com/developer/contribution-guide.html) which describes the process for making code contributions across Mattermost projects and [join our "Contributors" community channel](https://pre-release.mattermost.com/core/channels/tickets) to ask questions from community members and the Mattermost core team. ### Review Process for this Repo @@ -62,7 +62,7 @@ Two developers will review the pull request and either give feedback or approve Review process is complete and the pull request is merged. - Dev assigns `3: Ready to Merge` label. - - If Mattermost is not in release mode (between [major feature cut and release candidate cut](https://docs.mattermost.com/process/release-process.html), the PR is merged into `master`. + - If Mattermost is not in release mode (between [major feature cut and release candidate cut](https://docs.mattermost.com/process/release-process.html)), the PR is merged into `master`. - If the PR is a major change, merge is postponed until the next release cycle. - Dev calls out on the issue that it is a major change and it will be merged after branching. - Once the current release is branched the PR can be merged into `master`. |