gitlab-org--gitlab-foss/app/services/merge_requests/conflicts/resolve_service.rb
2017-10-12 22:03:14 -03:00

11 lines
327 B
Ruby

module MergeRequests
module Conflicts
class ResolveService < MergeRequests::Conflicts::BaseService
def execute(current_user, params)
conflicts = Gitlab::Conflict::FileCollection.new(merge_request)
conflicts.resolve(current_user, params[:commit_message], params[:files])
end
end
end
end