blob: a7900860c7ea1460436efa4c6fdbdfb8fdb7c2a3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
module MergeRequests
module Conflicts
class ResolveService < MergeRequests::Conflicts::BaseService
def execute(current_user, params)
conflicts = Gitlab::Conflict::FileCollection.for_resolution(merge_request)
conflicts.resolve(current_user, params[:commit_message], params[:files])
end
end
end
end
|
