Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
ab714baf
Commit
ab714baf
authored
Jan 03, 2019
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show a valid new merge request URL in EE case
parent
fde4eb73
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
bin/secpick
bin/secpick
+11
-3
No files found.
bin/secpick
View file @
ab714baf
...
...
@@ -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, default
s
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment