BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
22775c59
Commit
22775c59
authored
Oct 15, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Preserve target branch
parent
2611d9f6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
refresh_service.rb
app/services/merge_requests/refresh_service.rb
+5
-1
No files found.
app/services/merge_requests/refresh_service.rb
View file @
22775c59
...
@@ -55,7 +55,11 @@ module MergeRequests
...
@@ -55,7 +55,11 @@ module MergeRequests
# Refresh merge request diff if we push to source or target branch of merge request
# Refresh merge request diff if we push to source or target branch of merge request
# Note: we should update merge requests from forks too
# Note: we should update merge requests from forks too
def
reload_merge_requests
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?
if
merge_request
.
source_branch
==
@branch_name
||
force_push?
merge_request
.
reload_code
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