summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-02-06 16:05:26 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2019-02-06 16:32:10 +0100
commit67ca0be00424d66ee46f8f382d09e7daf256b265 (patch)
treee9c8a037280fc30fcb3c3b8e8819e12540edd203 /bin
parent8e9dd62233ac667281aca872c35be08fc213dfd5 (diff)
downloadgitlab-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 'bin')
-rwxr-xr-xbin/secpick4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/secpick b/bin/secpick
index ca9d901120d..8f956d300a7 100755
--- a/bin/secpick
+++ b/bin/secpick
@@ -10,7 +10,7 @@ using Rainbow
module Secpick
BRANCH_PREFIX = 'security'.freeze
- STABLE_PREFIX = 'stable'.freeze
+ STABLE_SUFFIX = 'stable'.freeze
DEFAULT_REMOTE = 'dev'.freeze
NEW_MR_URL = 'https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/new'.freeze
@@ -38,7 +38,7 @@ module Secpick
end
def stable_branch
- "#{STABLE_PREFIX}-#{@options[:version]}".tap do |name|
+ "#{@options[:version]}-#{STABLE_SUFFIX}".tap do |name|
name << "-ee" if ee?
end.freeze
end