diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /bin/secpick | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'bin/secpick')
-rwxr-xr-x | bin/secpick | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bin/secpick b/bin/secpick index 517465d3f5d..07bac9270c9 100755 --- a/bin/secpick +++ b/bin/secpick @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -# frozen_string_literal: false +# frozen_string_literal: true require 'active_support/core_ext/object/to_query' require 'optparse' @@ -9,12 +9,12 @@ require 'rainbow/refinement' using Rainbow module Secpick - BRANCH_PREFIX = 'security'.freeze - STABLE_SUFFIX = 'stable'.freeze + BRANCH_PREFIX = 'security' + STABLE_SUFFIX = 'stable' - DEFAULT_REMOTE = 'security'.freeze + DEFAULT_REMOTE = 'security' - SECURITY_MR_URL = 'https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/new'.freeze + SECURITY_MR_URL = 'https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/new' class SecurityFix def initialize @@ -27,12 +27,12 @@ module Secpick def source_branch branch = "#{@options[:branch]}-#{@options[:version]}" - branch.prepend("#{BRANCH_PREFIX}-") unless branch.start_with?("#{BRANCH_PREFIX}-") - branch.freeze + branch = "#{BRANCH_PREFIX}-#{branch}" unless branch.start_with?("#{BRANCH_PREFIX}-") + branch end def stable_branch - "#{@options[:version]}-#{STABLE_SUFFIX}-ee".freeze + "#{@options[:version]}-#{STABLE_SUFFIX}-ee" end def git_commands |