kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Show a valid new merge request URL in EE case

This commit is contained in:
Grzegorz Bizon 2019-01-03 13:14:09 +01:00
parent fde4eb7331
commit ab714baf0e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/secpick
View File

@ -27,11 +27,11 @@ parser = OptionParser.new do |opts|
options[:sha] = sha
end
opts.on('-r', '--remote abcd', 'Git remote name of dev.gitlab.org (optional, default to `dev`)') do |remote|
opts.on('-r', '--remote abcd', 'Git remote name of dev.gitlab.org (optional, defaults to `dev`)') do |remote|
options[:remote] = remote
end
opts.on('-d', '--dry-run', 'Show resulting Git commands without calling them') do |remote|
opts.on('-d', '--dry-run', 'Only show Git commands, without calling them') do |remote|
options[:try] = true
end
@ -100,6 +100,14 @@ class SecurityFix
}
end
def new_mr_url
if ee?
NEW_MR_URL.sub('gitlabhq', 'gitlab-ee')
else
NEW_MR_URL
end
end
def create!
if dry_run?
puts git_commands.join("\n").green
@ -113,7 +121,7 @@ class SecurityFix
puts stderr.read&.red
if wait_thr.value.success?
puts "#{NEW_MR_URL}?#{gitlab_params.to_query}".blue
puts "#{new_mr_url}?#{gitlab_params.to_query}".blue
end
stdin.close