diff options
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 7f7bfa29af7..7e301f311e9 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -2,6 +2,7 @@ module MergeRequests class BaseService < ::IssuableBaseService + extend ::Gitlab::Utils::Override include MergeRequests::AssignsMergeParams def create_note(merge_request, state = merge_request.state) @@ -29,6 +30,11 @@ module MergeRequests .execute_for_merge_request(merge_request) end + def cancel_review_app_jobs!(merge_request) + environments = merge_request.environments.in_review_folder.available + environments.each { |environment| environment.cancel_deployment_jobs! } + end + def source_project @source_project ||= merge_request.source_project end @@ -58,6 +64,12 @@ module MergeRequests super end + override :handle_quick_actions + def handle_quick_actions(merge_request) + super + handle_wip_event(merge_request) + end + def handle_wip_event(merge_request) if wip_event = params.delete(:wip_event) # We update the title that is provided in the params or we use the mr title @@ -90,10 +102,6 @@ module MergeRequests MergeRequests::CreatePipelineService.new(project, user).execute(merge_request) end - def can_use_merge_request_ref?(merge_request) - !merge_request.for_fork? - end - def abort_auto_merge(merge_request, reason) AutoMergeService.new(project, current_user).abort(merge_request, reason) end |