2014-09-02 18:07:02 +05:30
|
|
|
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
|
2015-04-26 12:48:37 +05:30
|
|
|
def execute(merge_request, commit_message)
|
2014-09-02 18:07:02 +05:30
|
|
|
merge_request.merge
|
|
|
|
|
|
|
|
create_merge_event(merge_request, current_user)
|
2015-04-26 12:48:37 +05:30
|
|
|
create_note(merge_request)
|
|
|
|
notification_service.merge_mr(merge_request, current_user)
|
|
|
|
execute_hooks(merge_request, 'merge')
|
2014-09-02 18:07:02 +05:30
|
|
|
|
|
|
|
true
|
|
|
|
rescue
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|