Class: MergeRequests::Conflicts::ResolveService

Inherits:
BaseService
  • Object
show all
Defined in:
app/services/merge_requests/conflicts/resolve_service.rb

Instance Attribute Summary

Attributes inherited from BaseService

#merge_request, #params

Instance Method Summary collapse

Methods inherited from BaseService

#initialize

Constructor Details

This class inherits a constructor from MergeRequests::Conflicts::BaseService

Instance Method Details

#execute(current_user, params) ⇒ Object 



6
7
8
9
10
 
# File 'app/services/merge_requests/conflicts/resolve_service.rb', line 6

def execute(current_user, params)
  conflicts = Gitlab::Conflict::FileCollection.new(merge_request)

  conflicts.resolve(current_user, params[:commit_message], params[:files])
end