diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-05-14 08:28:27 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-05-14 08:28:27 +0000 |
commit | 902078477e0f1cda33609f4b3bb08eebd4925fe4 (patch) | |
tree | 68e443c96080531e45b4e498ab283d5c4104d395 | |
parent | 3a1843f9470e8916d65e182f33c1e5f53b217140 (diff) | |
parent | 07adee306e960ce1151f6fc14914db3515e2724f (diff) | |
download | gitlab-ce-902078477e0f1cda33609f4b3bb08eebd4925fe4.tar.gz |
Merge branch 'docs/rs-code-review' into 'master'
Add Code Review documentation that maintainers also perform code review
See merge request gitlab-org/gitlab-ce!18911
-rw-r--r-- | CONTRIBUTING.md | 3 | ||||
-rw-r--r-- | doc/development/code_review.md | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4f5d19ce2ce..d82f21fe795 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -728,6 +728,3 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [polling-etag]: https://docs.gitlab.com/ce/development/polling.html [testing]: doc/development/testing_guide/index.md [us-english]: https://en.wikipedia.org/wiki/American_English - -[^1]: Please note that specs other than JavaScript specs are considered backend - code. diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 7165b8062a7..d03b7fa23ca 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -29,6 +29,10 @@ There are a few rules to get your merge request accepted: to ask one of the [Merge request coaches][team]. 1. The reviewer will assign the merge request to a maintainer once the reviewer is satisfied with the state of the merge request. +1. Keep in mind that maintainers are also going to perform a final code review. + The ideal scenario is that the reviewer has already addressed any concerns + the maintainer would have found, and the maintainer only has to perform the + merge, but be prepared for further review comments. For more guidance, see [CONTRIBUTING.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md). @@ -207,3 +211,4 @@ Largely based on the [thoughtbot code review guide]. [projects]: https://about.gitlab.com/handbook/engineering/projects/ [team]: https://about.gitlab.com/team/ [build handbook]: https://about.gitlab.com/handbook/build/handbook/build#how-to-work-with-build +[^1]: Please note that specs other than JavaScript specs are considered backend code. |