diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-06 16:05:26 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-06 16:32:10 +0100 |
| commit | 67ca0be00424d66ee46f8f382d09e7daf256b265 (patch) | |
| tree | e9c8a037280fc30fcb3c3b8e8819e12540edd203 /.gitlab | |
| parent | 8e9dd62233ac667281aca872c35be08fc213dfd5 (diff) | |
| download | gitlab-ce-67ca0be00424d66ee46f8f382d09e7daf256b265.tar.gz | |
Fix incorrect stable branch name for templatesfix-stable-branch-prefix
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24962 the
stable branches were incorrectly changed to `stable-X-Y`. This commit
fixes this so we correctly use `X-Y-stable`.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 2 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index da2e2a7f87f..aaa16145399 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -20,7 +20,7 @@ Set the title to: `Description of the original issue` - [ ] Once the MR is ready to be merged, create MRs targetting the last 3 releases, plus the current RC if between the 7th and 22nd of the month. - [ ] At this point, it might be easy to squash the commits from the MR into one - You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation] - - [ ] Create each MR targetting the stable branch `stable-X-Y`, using the "Security Release" merge request template. + - [ ] Create each MR targetting the stable branch `X-Y-stable`, using the "Security Release" merge request template. - Every merge request will have its own set of TODOs, so make sure to complete those. - [ ] Make sure all MRs have a link in the [links section](#links) diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index adf70053f8f..246f2dae009 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -15,7 +15,7 @@ targets master. ## Developer checklist - [ ] Link to the developer security workflow issue on `dev.gitlab.org` -- [ ] MR targets `master`, or `stable-X-Y` for backports +- [ ] MR targets `master`, or `X-Y-stable` for backports - [ ] Milestone is set for the version this MR applies to - [ ] Title of this MR is the same as for all backports - [ ] A [CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html) is added without a `merge_request` value, with `type` set to `security` |