summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-12 12:09:02 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-12 12:09:02 +0000
commit49d26b2348f2eb9e345eb1f66214678f42f15dd3 (patch)
treee68c6c2e50aae17d37a4d5508613b3d93627a5e2 /bin
parent7f5e08060f261a63ebf5058a95419da66928173a (diff)
downloadgitlab-ce-49d26b2348f2eb9e345eb1f66214678f42f15dd3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-xbin/secpick16
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