diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-03 22:05:32 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-03 22:05:32 +0000 |
| commit | 3e43214ff64b2b6761e781b250934ea54292d995 (patch) | |
| tree | be0cd9a884ef992e1fdd3a23f0bb2596c8dc2852 | |
| parent | f5d6a86f38e3681c447e7e23ca99bb61ec666cea (diff) | |
| parent | 1fddfa8f2a7b6bd6e71f7e997f152a2f8baa15d4 (diff) | |
| download | gitlab-ce-3e43214ff64b2b6761e781b250934ea54292d995.tar.gz | |
Merge branch 'link-to-code-review-guide' into 'master'
Link to GitLab code review guide in contributing guidelines
I noticed that the contributing guidelines still link to the thoughtbot
code review guidelines even though we already have our own.
[ci skip]
See merge request !4018
| -rw-r--r-- | CONTRIBUTING.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 084c2d616a9..ed565b0e573 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -349,7 +349,7 @@ on your merge request feel free to mention one of the Merge Marshalls in the Please ensure that your merge request meets the contribution acceptance criteria. When having your code reviewed and when reviewing merge requests please take the -[Thoughtbot code review guide] into account. +[code review guidelines](doc/development/code_review.md) into account. ### Merge request description format @@ -523,4 +523,3 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design [free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12 [`gitlab1.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/gitlab1.atype/ -[Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review |