diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-21 17:24:09 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-21 17:24:09 +0200 |
| commit | 9c61b73c21f70b3f4a7e3e8f4b7e4d8ad0544094 (patch) | |
| tree | a6e8ecd68eb1c6bf11dbe016344f35a9d8c6dec9 | |
| parent | d25b50fda63e830cb2c87281bba064b71185e712 (diff) | |
| download | gitlab-ce-9c61b73c21f70b3f4a7e3e8f4b7e4d8ad0544094.tar.gz | |
Make sure MR refresh service correctly determines newly added commits.
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index 121f6899011..2808b98a4a0 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -7,6 +7,8 @@ module MergeRequests @branch_name = Gitlab::Git.ref_name(ref) @fork_merge_requests = @project.fork_merge_requests.opened @commits = [] + + reload_merge_requests # Leave a system note if a branch were deleted/added if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev) @@ -18,7 +20,6 @@ module MergeRequests close_merge_requests end - reload_merge_requests execute_mr_web_hooks true |