diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-18 11:58:01 +0100 |
| commit | 53b285c9a8b7eec9ee10906ef519da376347b69e (patch) | |
| tree | e3fa4f337112cedb08343e7d3ea85ecc1f48fb1d /app/services/merge_requests/refresh_service.rb | |
| parent | 2f048df4a4a83ff009d2ef2d14ee04e5a2798618 (diff) | |
| parent | 21a59b23fe4d8bc4331f746c75f9242a49d75faa (diff) | |
| download | gitlab-ce-53b285c9a8b7eec9ee10906ef519da376347b69e.tar.gz | |
Merge branch 'master' into merge-if-green
Diffstat (limited to 'app/services/merge_requests/refresh_service.rb')
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index e5024857201..b26c7513f5b 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -7,18 +7,18 @@ module MergeRequests @branch_name = Gitlab::Git.ref_name(ref) find_new_commits + # Be sure to close outstanding MRs before reloading them to avoid generating an + # empty diff during a manual merge + close_merge_requests reload_merge_requests reset_merge_when_build_succeeds # Leave a system note if a branch was deleted/added if branch_added? || branch_removed? comment_mr_branch_presence_changed - comment_mr_with_commits - else - comment_mr_with_commits - close_merge_requests end + comment_mr_with_commits execute_mr_web_hooks true |