From 5c763ac4c62bdeb0f0fe26f710c0a7a91921a949 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 27 May 2020 06:08:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../Change Documentation Location.md | 32 ++++++++++++++++++++++ .../Change documentation location.md | 32 ---------------------- .../New Static Analysis Check.md | 27 ++++++++++++++++++ .../New static analysis check.md | 27 ------------------ 4 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 .gitlab/merge_request_templates/Change Documentation Location.md delete mode 100644 .gitlab/merge_request_templates/Change documentation location.md create mode 100644 .gitlab/merge_request_templates/New Static Analysis Check.md delete mode 100644 .gitlab/merge_request_templates/New static analysis check.md (limited to '.gitlab/merge_request_templates') diff --git a/.gitlab/merge_request_templates/Change Documentation Location.md b/.gitlab/merge_request_templates/Change Documentation Location.md new file mode 100644 index 00000000000..f18957fdaaa --- /dev/null +++ b/.gitlab/merge_request_templates/Change Documentation Location.md @@ -0,0 +1,32 @@ + + + + +## What does this MR do? + + + +## Related issues + + + +Closes + +## Moving docs to a new location? + +Read the guidelines: +https://docs.gitlab.com/ee/development/documentation/index.html#changing-document-location + +- [ ] Make sure the old link is not removed and has its contents replaced with + a link to the new location. +- [ ] Make sure internal links pointing to the document in question are not broken. +- [ ] Search and replace any links referring to old docs in GitLab Rails app, + specifically under the `app/views/` and `ee/app/views` (for GitLab EE) directories. +- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ce/development/documentation/index.html#redirections-for-pages-with-disqus-comments) + to the new document if there are any Disqus comments on the old document thread. +- [ ] Update the link in `features.yml` (if applicable) +- [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE + with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee). +- [ ] Ping one of the technical writers for review. + +/label ~documentation diff --git a/.gitlab/merge_request_templates/Change documentation location.md b/.gitlab/merge_request_templates/Change documentation location.md deleted file mode 100644 index f18957fdaaa..00000000000 --- a/.gitlab/merge_request_templates/Change documentation location.md +++ /dev/null @@ -1,32 +0,0 @@ - - - - -## What does this MR do? - - - -## Related issues - - - -Closes - -## Moving docs to a new location? - -Read the guidelines: -https://docs.gitlab.com/ee/development/documentation/index.html#changing-document-location - -- [ ] Make sure the old link is not removed and has its contents replaced with - a link to the new location. -- [ ] Make sure internal links pointing to the document in question are not broken. -- [ ] Search and replace any links referring to old docs in GitLab Rails app, - specifically under the `app/views/` and `ee/app/views` (for GitLab EE) directories. -- [ ] Make sure to add [`redirect_from`](https://docs.gitlab.com/ce/development/documentation/index.html#redirections-for-pages-with-disqus-comments) - to the new document if there are any Disqus comments on the old document thread. -- [ ] Update the link in `features.yml` (if applicable) -- [ ] If working on CE and the `ee-compat-check` jobs fails, submit an MR to EE - with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee). -- [ ] Ping one of the technical writers for review. - -/label ~documentation diff --git a/.gitlab/merge_request_templates/New Static Analysis Check.md b/.gitlab/merge_request_templates/New Static Analysis Check.md new file mode 100644 index 00000000000..8bbb3effb1c --- /dev/null +++ b/.gitlab/merge_request_templates/New Static Analysis Check.md @@ -0,0 +1,27 @@ +## Description of the proposal + + + +### Check-list + +- [ ] Make sure this MR enables a static analysis check rule for new usage but + ignores current offenses +- [ ] 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: + - CHOICE_B: :b: + - Vote yourself for both choices so that people know these are the choices +- [ ] 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`) + - [ ] (Optional depending on the impact of the change) In the Engineering Week in Review + +/label ~"Engineering Productivity" ~"Style decision" ~"development guidelines" ~"static analysis" + +/cc @gitlab-org/maintainers/rails-backend diff --git a/.gitlab/merge_request_templates/New static analysis check.md b/.gitlab/merge_request_templates/New static analysis check.md deleted file mode 100644 index 8bbb3effb1c..00000000000 --- a/.gitlab/merge_request_templates/New static analysis check.md +++ /dev/null @@ -1,27 +0,0 @@ -## Description of the proposal - - - -### Check-list - -- [ ] Make sure this MR enables a static analysis check rule for new usage but - ignores current offenses -- [ ] 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: - - CHOICE_B: :b: - - Vote yourself for both choices so that people know these are the choices -- [ ] 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`) - - [ ] (Optional depending on the impact of the change) In the Engineering Week in Review - -/label ~"Engineering Productivity" ~"Style decision" ~"development guidelines" ~"static analysis" - -/cc @gitlab-org/maintainers/rails-backend -- cgit v1.2.3