diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-03 00:08:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-03 00:08:00 +0300 |
commit | 2164573e4531de7949b0ad9fe1d55bfb9c42765d (patch) | |
tree | 10cf954a1225eb3162009f5c2457bacdc388aa63 /bin | |
parent | f3e7bc80608c100227030030a6a601897f8e4ff9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/secpick | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/bin/secpick b/bin/secpick index a68dabc8c47..4d056ceecaf 100755 --- a/bin/secpick +++ b/bin/secpick @@ -21,10 +21,6 @@ module Secpick @options = self.class.options end - def ee? - File.exist?(File.expand_path('../ee/app/models/license.rb', __dir__)) - end - def dry_run? @options[:try] == true end @@ -40,9 +36,7 @@ module Secpick end def stable_branch - "#{@options[:version]}-#{STABLE_SUFFIX}".tap do |name| - name << "-ee" if ee? - end.freeze + "#{@options[:version]}-#{STABLE_SUFFIX}-ee".freeze end def git_commands @@ -64,11 +58,7 @@ module Secpick end def new_mr_url - if ee? - SECURITY_MR_URL - else - SECURITY_MR_URL.sub('/gitlab/', '/gitlab-foss/') - end + SECURITY_MR_URL end def create! |