Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 00:08:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-12 00:08:44 +0300
commit0e9eea40b62fcae67b2bd885dbedd7525fbca3c7 (patch)
tree099467fd4c16441f60a879239056b235c7fdabdc /doc/development/code_review.md
parent1ca9950d5f890cd8f185e1eda158b969a7244fe2 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/code_review.md')
-rw-r--r--doc/development/code_review.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index ddece96a9af..41ebcc7f2d0 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -107,7 +107,7 @@ confidence in their solution will not have been reached.
Before the review, the author is requested to submit comments on the merge
request diff alerting the reviewer to anything important as well as for anything
-that demands further explanation or attention. Examples of content that may
+that demands further explanation or attention. Examples of content that may
warrant a comment could be:
- The addition of a linting rule (Rubocop, JS etc)
@@ -181,8 +181,8 @@ vulnerabilities must be either empty or containing:
Maintainers should **never** dismiss vulnerabilities to "empty" the list,
without duly verifying them.
-Note that certain Merge Requests may target a stable branch. These are rare
-events. These types of Merge Requests cannot be merged by the Maintainer.
+Note that certain Merge Requests may target a stable branch. These are rare
+events. These types of Merge Requests cannot be merged by the Maintainer.
Instead these should be sent to the [Release Manager](https://about.gitlab.com/community/release-managers/).
## Best practices