From aaf59610548d9b0fd01acfd50e831cbe519ecba2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Mar 2020 15:09:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .gitlab/merge_request_templates/New static analysis check.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab/merge_request_templates') diff --git a/.gitlab/merge_request_templates/New static analysis check.md b/.gitlab/merge_request_templates/New static analysis check.md index b89b6f7dbc4..8bbb3effb1c 100644 --- a/.gitlab/merge_request_templates/New static analysis check.md +++ b/.gitlab/merge_request_templates/New static analysis check.md @@ -8,7 +8,6 @@ Please describe the proposal and add a link to the source (for example, http://w - [ ] Make sure this MR enables a static analysis check rule for new usage but ignores current offenses -- [ ] Create a follow-up issue to fix the current offenses as a separate iteration: ISSUE_LINK - [ ] Mention this proposal in the relevant Slack channels (e.g. `#development`, `#backend`, `#frontend`) - [ ] If there is a choice to make between two potential styles, set up an emoji vote in the MR: - CHOICE_A: :a: @@ -17,6 +16,7 @@ Please describe the proposal and add a link to the source (for example, http://w - [ ] The MR doesn't have significant objections, and is getting a majority of :+1: vs :-1: (remember that [we don't need to reach a consensus](https://about.gitlab.com/handbook/values/#collaboration-is-not-consensus)) - [ ] (If applicable) One style is getting a majority of vote (compared to the other choice) - [ ] (If applicable) Update the MR with the chosen style +- [ ] Create a follow-up issue to fix the current offenses as a separate iteration: ISSUE_LINK - [ ] Follow the [review process](https://docs.gitlab.com/ee/development/code_review.html) as usual - [ ] Once approved and merged by a maintainer, mention it again: - [ ] In the relevant Slack channels (e.g. `#development`, `#backend`, `#frontend`) -- cgit v1.2.3