diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2022-03-21 01:20:10 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2022-03-21 01:20:10 +0300 |
| commit | 65bf4a6024e01fae8b4c88d6e577e3ad145d87d7 (patch) | |
| tree | 5b8717bcce69833b4c71baff9a6770d9bdc5ea33 /.gitlab | |
| parent | c9a01682aaa1bdb4b5c7b0234b8eb14f8ae444e1 (diff) | |
| parent | 1e66146ab60173587de8ba0543b03ee670376a67 (diff) | |
Merge branch 'kassio/update-templates' into 'master'
Category:Pages is now under group::editor devops::create
See merge request gitlab-org/gitlab-pages!708
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/prepare.yml | 1 | ||||
| -rw-r--r-- | .gitlab/issue_templates/release.md | 4 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab/ci/prepare.yml b/.gitlab/ci/prepare.yml index 66d23adf..c5481a19 100644 --- a/.gitlab/ci/prepare.yml +++ b/.gitlab/ci/prepare.yml @@ -53,4 +53,3 @@ secret_detection: rules: # For merge requests, create a pipeline. - if: '$CI_MERGE_REQUEST_IID' - diff --git a/.gitlab/issue_templates/release.md b/.gitlab/issue_templates/release.md index 7ca78f29..7d14e330 100644 --- a/.gitlab/issue_templates/release.md +++ b/.gitlab/issue_templates/release.md @@ -6,7 +6,7 @@ - [ ] Create an MR for [gitlab-pages project](https://gitlab.com/gitlab-org/gitlab-pages). You can use [this MR](https://gitlab.com/gitlab-org/gitlab-pages/merge_requests/217) as an example. - [ ] Update `VERSION`, and push your branch - - [ ] Update `CHANGELOG` by running `GITLAB_PRIVATE_TOKEN= make changelog`, note that you need to create a personal access token + - [ ] Update `CHANGELOG` by running `GITLAB_PRIVATE_TOKEN= make changelog`, note that you need to create a personal access token - [ ] Assign to reviewer - [ ] Once `gitlab-pages` is merged create a signed+annotated tag pointing to the **merge commit** on the **stable branch** In case of `master` branch: @@ -42,4 +42,4 @@ - [ ] Added `Changelog: added` footer to your commit - [ ] Assign to a reviewer -/label ~backend ~"Category:Pages" ~"devops::release" ~"group::release" ~"type::maintenance" +/label ~backend ~"Category:Pages" ~"devops::create" ~"group::editor" ~"type::maintenance" diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index ea892588..2f7b41d7 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -32,4 +32,4 @@ When submitting a merge request for gitlab-pages, CE and EE merge requests for u [CHANGELOG entry]: https://docs.gitlab.com/ee/development/changelog.html#overview -/label ~security +/label ~security ~backend ~"Category:Pages" |