Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
8d1b7c68b844
Commit
22775c59
authored
Oct 15, 2015
by
Stan Hu
Browse files
Preserve target branch
parent
756991a25da7
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/services/merge_requests/refresh_service.rb
View file @
8d1b7c68
...
...
@@ -55,7 +55,11 @@ def force_push?
# Refresh merge request diff if we push to source or target branch of merge request
# Note: we should update merge requests from forks too
def
reload_merge_requests
@merge_requests
.
each
do
|
merge_request
|
merge_requests
=
@project
.
merge_requests
.
opened
.
by_branch
(
@branch_name
).
to_a
merge_requests
+=
@fork_merge_requests
.
by_branch
(
@branch_name
).
to_a
merge_requests
=
filter_merge_requests
(
merge_requests
)
merge_requests
.
each
do
|
merge_request
|
if
merge_request
.
source_branch
==
@branch_name
||
force_push?
merge_request
.
reload_code
...
...
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