diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-04 11:24:07 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-04 11:24:07 +0000 |
| commit | 5d2595da56f911ad30aaa7d7b2603d8bd640adb8 (patch) | |
| tree | 7923283a15f64202db92bdd33b48a3f55fd594e2 /app/services | |
| parent | 0b864208e44a1ab44754926f1d1529479387b360 (diff) | |
| parent | 9b91e6816ce6b7544856fd2b52049836b5e2d250 (diff) | |
| download | gitlab-ce-5d2595da56f911ad30aaa7d7b2603d8bd640adb8.tar.gz | |
Merge branch 'cancel-auto-merge-when-merge-request-is-closed' into 'master'
Cancel auto merge when merge request is closed
See merge request gitlab-org/gitlab-ce!28782
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/close_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/merge_requests/close_service.rb b/app/services/merge_requests/close_service.rb index e77051bb1c9..b0f6166ea1c 100644 --- a/app/services/merge_requests/close_service.rb +++ b/app/services/merge_requests/close_service.rb @@ -18,6 +18,7 @@ module MergeRequests invalidate_cache_counts(merge_request, users: merge_request.assignees) merge_request.update_project_counter_caches cleanup_environments(merge_request) + cancel_auto_merge(merge_request) end merge_request @@ -33,5 +34,9 @@ module MergeRequests merge_request_metrics_service(merge_request).close(close_event) end end + + def cancel_auto_merge(merge_request) + AutoMergeService.new(project, current_user).cancel(merge_request) + end end end |