Commit df6fd445 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'secpick-update' into 'master'

Remove ee? check from secpick script

See merge request gitlab-org/gitlab!32903
parents 40bddfec e1ee11eb
...@@ -21,10 +21,6 @@ module Secpick ...@@ -21,10 +21,6 @@ module Secpick
@options = self.class.options @options = self.class.options
end end
def ee?
File.exist?(File.expand_path('../ee/app/models/license.rb', __dir__))
end
def dry_run? def dry_run?
@options[:try] == true @options[:try] == true
end end
...@@ -40,9 +36,7 @@ module Secpick ...@@ -40,9 +36,7 @@ module Secpick
end end
def stable_branch def stable_branch
"#{@options[:version]}-#{STABLE_SUFFIX}".tap do |name| "#{@options[:version]}-#{STABLE_SUFFIX}-ee".freeze
name << "-ee" if ee?
end.freeze
end end
def git_commands def git_commands
...@@ -64,11 +58,7 @@ module Secpick ...@@ -64,11 +58,7 @@ module Secpick
end end
def new_mr_url def new_mr_url
if ee? SECURITY_MR_URL
SECURITY_MR_URL
else
SECURITY_MR_URL.sub('/gitlab/', '/gitlab-foss/')
end
end end
def create! def create!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment