From e4db1a615b9f30574c063bda9f6183654f74586e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 28 Jan 2019 12:21:42 +0100 Subject: Create security release MR template Improve existing issue templates for security releases --- .gitlab/issue_templates/Security Release.md | 24 +++++++++++----------- .../issue_templates/Security developer workflow.md | 13 +++++------- 2 files changed, 17 insertions(+), 20 deletions(-) (limited to '.gitlab/issue_templates') diff --git a/.gitlab/issue_templates/Security Release.md b/.gitlab/issue_templates/Security Release.md index 1734e915ad2..ae469d3b125 100644 --- a/.gitlab/issue_templates/Security Release.md +++ b/.gitlab/issue_templates/Security Release.md @@ -32,12 +32,12 @@ Set the title to: `Security Release: 11.4.X, 11.3.X, and 11.2.X` - {https://dev.gitlab.org/gitlab/gitlabhq/issues link} -| Version | MR | Status| -|---------|----|-------| -| 11.4 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | | -| 11.3 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | | -| 11.2 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | | -| master | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | | +| Version | MR | +|---------|----| +| 11.4 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | +| 11.3 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | +| 11.2 | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | +| master | {https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/ link} | @@ -46,12 +46,12 @@ Set the title to: `Security Release: 11.4.X, 11.3.X, and 11.2.X` * {https://dev.gitlab.org/gitlab/gitlabhq/issues/ link} -| Version | MR | Status| -|---------|----|-------| -| 11.4| {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | | -| 11.3 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | | -| 11.2 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | | -| master | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | | +| Version | MR | +|---------|----| +| 11.4| {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | +| 11.3 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | +| 11.2 | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | +| master | {https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/ link} | ## QA diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index f9bf700f809..4bc4215d21b 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -3,20 +3,17 @@ Create this issue under https://dev.gitlab.org/gitlab/gitlabhq -Set the title to: `[Security] Description of the original issue` +Set the title to: `Description of the original issue` --> -### Prior to the security release +### Prior to starting the security release work - [ ] Read the [security process for developers] if you are not familiar with it. - [ ] Link to the original issue adding it to the [links section](#links) - [ ] Run `scripts/security-harness` in the CE, EE, and/or Omnibus to prevent pushing to any remote besides `dev.gitlab.org` -- [ ] Create an MR targetting `org` `master`, prefixing your branch with `security-` -- [ ] Label your MR with the ~security label, prefix the title with `WIP: [master]` -- [ ] Add a link to the MR to the [links section](#links) -- [ ] Add a link to an EE MR if required -- [ ] Make sure the MR remains in-progress and gets approved after the review cycle, **but never merged**. -- [ ] Add a link to this issue on the original security issue. +- [ ] Create a new branch prefixing it with `security-` +- [ ] Create a MR targeting `dev.gitlab.org` `master` +- [ ] Add a link to this issue in the original security issue on `gitlab.com`. #### Backports -- cgit v1.2.3 From 9937b07bf3a1091f74bd75ba30df5e95ce18f3b9 Mon Sep 17 00:00:00 2001 From: Victor Zagorodny Date: Wed, 6 Feb 2019 11:38:18 +0000 Subject: Fix comment typo in feature proposal issue template --- .gitlab/issue_templates/Feature proposal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab/issue_templates') diff --git a/.gitlab/issue_templates/Feature proposal.md b/.gitlab/issue_templates/Feature proposal.md index 0b22c7bc26b..1bb8d33ff63 100644 --- a/.gitlab/issue_templates/Feature proposal.md +++ b/.gitlab/issue_templates/Feature proposal.md @@ -39,7 +39,7 @@ Existing personas are: (copy relevant personas out of this comment, and delete a ### What does success look like, and how can we measure that? - + ### Links / references -- cgit v1.2.3 From 0d05c58116d1eb6015b50d36ea194ed4a459ee8d Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 6 Feb 2019 14:14:55 +0100 Subject: Remove requirement to target security branches This removes the requirement and any mention of targeting security branches when working on security releases. The release process documentation changes for these CE changes can be found in merge request https://gitlab.com/gitlab-org/release/docs/merge_requests/97. The proposal to remove security branches was approved in https://gitlab.com/gitlab-org/release/framework/issues/165#note_138139016. --- .gitlab/issue_templates/Security developer workflow.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to '.gitlab/issue_templates') diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 4bc4215d21b..da2e2a7f87f 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -20,10 +20,9 @@ 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 the branch `security-X-Y` from `X-Y-stable` if it doesn't exist (and make sure it's up to date with stable) - - [ ] Create each MR targetting the security branch `security-X-Y` - - [ ] Add the ~security label and prefix with the version `WIP: [X.Y]` the title of the MR -- [ ] Add the ~"Merge into Security" label to all of the MRs. + - [ ] Create each MR targetting the stable branch `stable-X-Y`, 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) [secpick documentation]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md#secpick-script -- cgit v1.2.3 From 67ca0be00424d66ee46f8f382d09e7daf256b265 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 6 Feb 2019 16:05:26 +0100 Subject: Fix incorrect stable branch name for templates 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`. --- .gitlab/issue_templates/Security developer workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab/issue_templates') 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) -- cgit v1.2.3