diff options
Diffstat (limited to '.gitlab/merge_request_templates')
-rw-r--r-- | .gitlab/merge_request_templates/New Version of gitlab-styles.md | 11 | ||||
-rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/merge_request_templates/New Version of gitlab-styles.md b/.gitlab/merge_request_templates/New Version of gitlab-styles.md index e6cde691e19..5e7f2319650 100644 --- a/.gitlab/merge_request_templates/New Version of gitlab-styles.md +++ b/.gitlab/merge_request_templates/New Version of gitlab-styles.md @@ -1,10 +1,11 @@ -<!-- Title suggestion: Upgrade `gilab-styles` to <VERSION X.Y.Z> - dry-run --> +<!-- Title suggestion: Upgrade `gitlab-styles` to <VERSION X.Y.Z> - dry-run --> ## What does this MR do and why? Validating upcoming release of `gitlab-styles` <VERSION X.Y.Z>. See <LINK TO RELEASE MR>. This MR can be reused to upgrade `gitlab-styles` in this project after a new version of `gitlab-styles` is released. + ### Checklist - [ ] Verify upcoming release of `gitlab-styles` @@ -13,8 +14,8 @@ This MR can be reused to upgrade `gitlab-styles` in this project after a new ver - [ ] Update [bundler's checksum file](https://docs.gitlab.com/ee/development/gemfile.html#updating-the-checksum-file) via `bundle exec bundler-checksum init` - [ ] `rubocop` job - [ ] Inspect any warnings/errors - - [ ] (Optional) [Generate TODOs](https://docs.gitlab.com/ee/development/contributing/style_guides.html#resolving-rubocop-exceptions) for pending offenses - - [ ] Put :new: cop rules (or if configuration is changed) in "grace period". See [docs](https://docs.gitlab.com/ee/development/contributing/style_guides.html#enabling-a-new-cop). + - [ ] (Optional) [Generate TODOs](https://docs.gitlab.com/ee/development/rubocop_development_guide.html#resolving-rubocop-exceptions) for pending offenses + - [ ] Put :new: cop rules (or if configuration is changed) in "grace period". See [docs](https://docs.gitlab.com/ee/development/rubocop_development_guide.html#enabling-a-new-cop). - [ ] (Optional) Remove any offenses for disabled cops - Use `grep --perl-regexp -o ":\d+\d+: \w: \[\S+\] ([\w/]+)" raw_job_output.log | awk '{print $4}' | sort | uniq -c` to get a list of cop rules with offenses. Where `raw_job_output.log` is the raw output of the `rubocop` job - [ ] Ignore offenses related to temporary changes in `Gemfile` @@ -32,9 +33,7 @@ This MR can be reused to upgrade `gitlab-styles` in this project after a new ver - [ ] (Optional) Regenerate TODOs for new/changed cop rules - [ ] Make sure CI passes :green_heart: - [ ] Let the MR being reviewed again and merged - - [ ] Make sure CI passes :green_heart: - - [ ] Let the MR being reviewed again and merged - - [ ] (Optional) Refine this [MR template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/merge_request_templates/New%20Version%20of%20gitlab-styles.md). + - [ ] (Optional) Refine this [MR template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/merge_request_templates/New%20Version%20of%20gitlab-styles.md). ## MR acceptance checklist diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index 334bcb16023..b443dd7570e 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -27,7 +27,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - [ ] Ensure it's approved by a maintainer. - [ ] Ensure this merge request and the related security issue have a `~severity::x` label -**Note:** Reviewer/maintainer should not be a Release Manager. +**Note:** Reviewer/maintainer should not be a [Release Manager]. ## Maintainer checklist @@ -45,3 +45,4 @@ See [the general developer security release guidelines](https://gitlab.com/gitla [Approval Guidelines]: https://docs.gitlab.com/ee/development/code_review.html#approval-guidelines [Canonical repository]: https://gitlab.com/gitlab-org/gitlab [`e2e:package-and-test` job]: https://docs.gitlab.com/ee/development/testing_guide/end_to_end/#using-the-package-and-test-job +[Release Manager]: https://about.gitlab.com/community/release-managers/ |