debian-mirror-gitlab/app/services/merge_requests/conflicts/resolve_service.rb

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

14 lines
358 B
Ruby
Raw Normal View History

2018-11-18 11:00:15 +05:30
# frozen_string_literal: true
2017-08-17 22:00:37 +05:30
module MergeRequests
module Conflicts
class ResolveService < MergeRequests::Conflicts::BaseService
def execute(current_user, params)
2018-03-17 18:26:18 +05:30
conflicts = Gitlab::Conflict::FileCollection.new(merge_request)
2017-08-17 22:00:37 +05:30
2018-03-17 18:26:18 +05:30
conflicts.resolve(current_user, params[:commit_message], params[:files])
2017-08-17 22:00:37 +05:30
end
end
end
end