diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-06-26 15:24:09 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-07-05 09:19:30 +0300 |
| commit | 587ffd11480db3ed492459ec2b6fac32a459ebaa (patch) | |
| tree | f695dba44247ea39cf3cbd53b33943880cbb6659 /app/services/merge_requests/base_service.rb | |
| parent | 9414a41f8390511005702ab4fec99239b6c3c6dd (diff) | |
Split AutoMergeService interfaces into two `cancel` and `abort`
Create explicit endpoint - abort.
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index c34fbeb2adb..067510a8a0a 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -68,8 +68,8 @@ module MergeRequests !merge_request.for_fork? end - def cancel_auto_merge(merge_request) - AutoMergeService.new(project, current_user).cancel(merge_request) + def abort_auto_merge(merge_request, reason) + AutoMergeService.new(project, current_user).abort(merge_request, reason) end # Returns all origin and fork merge requests from `@project` satisfying passed arguments. |