Commit Graph

21 Commits

Author SHA1 Message Date
GitLab Bot 6755df108b Add latest changes from gitlab-org/gitlab@master 2020-01-21 00:08:46 +00:00
GitLab Bot 97d4d92663 Add latest changes from gitlab-org/gitlab@master 2019-12-10 09:07:51 +00:00
GitLab Bot bf3d94a733 Add latest changes from gitlab-org/gitlab@master 2019-11-07 09:06:03 +00:00
GitLab Bot 0dea53d5e5 Add latest changes from gitlab-org/gitlab@master 2019-10-11 09:06:43 +00:00
Thong Kuah 96f8a282c6 Fix secpick pushing to stable branch 2019-07-30 10:51:29 +00:00
Robert Speicher 701303a5db Merge branch 'ac-secpick-template' into 'master'
Select Security Release template with secpick

See merge request gitlab-org/gitlab-ce!25246
2019-02-14 19:15:49 +00:00
Alessio Caiazza 3f100ee9ce Select Security Release template with secpick 2019-02-14 15:11:51 +01:00
Pavel Shutsin bba8dc7d67 Simplify bin/secpick git commands 2019-02-14 09:24:30 +00:00
Yorick Peterse 67ca0be004
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`.
2019-02-06 16:32:10 +01:00
Yorick Peterse 0d05c58116
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.
2019-02-06 14:14:55 +01:00
Marin Jankovski e4db1a615b
Create security release MR template
Improve existing issue templates for security releases
2019-01-28 12:51:37 +01:00
Grzegorz Bizon 1a2b9e3190 Fix Rubocop offenses in bin/secpick script 2019-01-07 13:38:31 +01:00
Grzegorz Bizon ab714baf0e Show a valid new merge request URL in EE case 2019-01-07 13:38:23 +01:00
Grzegorz Bizon fde4eb7331 Improve `bin/secpick` script and add more options
This adds additional options that make it easier to use this script:

1. It adds `--dry-run` option that only displays Git commands that are
going to be executed.
2. It adds `--remote` option that makes it possible to override Git
remote name.
2019-01-03 13:15:05 +01:00
James Lopez 9ba303bfed
Update secpick script 2018-12-18 10:21:29 +01:00
James Lopez 4585df83b9 Fix secpick to use EE and guess branch name 2018-10-24 17:20:03 +00:00
Michael Kozono 2e8fe26b9b Fix `bin/secpick` rainbow gem error, and security branch prefixing 2018-08-15 07:27:59 +00:00
James Lopez 02e7962ad4 Update secpick 2018-05-14 07:57:53 +00:00
James Lopez a758352bb1 Update secpick 2018-05-14 07:55:25 +00:00
James Lopez f3ddb9f462 Update secpick to use security branches 2018-05-14 07:46:04 +00:00
James Lopez 22e198dae1 add initial dev task template for working on a security issue 2018-04-17 16:50:16 +00:00