diff options
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
-rw-r--r-- | app/services/merge_requests/merge_service.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb deleted file mode 100644 index 327ead4ff3f..00000000000 --- a/app/services/merge_requests/merge_service.rb +++ /dev/null @@ -1,22 +0,0 @@ -module MergeRequests - # MergeService class - # - # Mark existing merge request as merged - # and execute all hooks and notifications - # Called when you do merge via command line and push code - # to target branch - class MergeService < BaseMergeService - def execute(merge_request, commit_message) - merge_request.merge - - create_merge_event(merge_request, current_user) - create_note(merge_request) - notification_service.merge_mr(merge_request, current_user) - execute_hooks(merge_request, 'merge') - - true - rescue - false - end - end -end |