diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-08 18:06:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-08 18:06:56 +0300 |
| commit | bfb24e1685fb574d3144865da29a21b38cb52883 (patch) | |
| tree | d694d329da73d9a312a6f819edaebebc3b081491 /.gitlab | |
| parent | e44c3e4832e43c77e9c29fad6e49f8d6066d7f5c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 5aa0fabfadf..e11b81d9ddd 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -482,6 +482,7 @@ rspec:coverage: FILES_TO_DOWNLOAD: > config/bundler_setup.rb Gemfile + Gemfile.checksum Gemfile.lock scripts/merge-simplecov spec/simplecov_env_core.rb diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index b443dd7570e..772b73d1066 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -13,6 +13,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla ## Developer checklist - [ ] **On "Related issues" section, write down the [GitLab Security] issue it belongs to (i.e. `Related to <issue_id>`).** +- [ ] Familiarize yourself with the latest process to create Security merge requests: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md#process - [ ] Merge request targets `master`, or a versioned stable branch (`X-Y-stable-ee`). - [ ] Title of this merge request is the same as for all backports. - [ ] A [CHANGELOG entry] has been included, with `Changelog` trailer set to `security`. @@ -24,7 +25,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - Trigger the [`e2e:package-and-test` job]. The docker image generated will be used by the AppSec engineer to validate the security vulnerability has been remediated. - [ ] For a backport MR targeting a versioned stable branch (`X-Y-stable-ee`). - [ ] Milestone is set to the version this backport applies to. A closed milestone can be assigned via [quick actions]. - - [ ] Ensure it's approved by a maintainer. + - [ ] Ensure it's approved by the same maintainer that reviewed and approved the merge request targeting the default branch. - [ ] Ensure this merge request and the related security issue have a `~severity::x` label **Note:** Reviewer/maintainer should not be a [Release Manager]. |