summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/resolve_service.rb
Commit message (Expand)AuthorAgeFilesLines
* Allow setting content for resolutionsSean McGivern2016-10-131-4/+20
* Use Repository#fetch_refSean McGivern2016-08-301-2/+7
* Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-uiSean McGivern2016-08-301-1/+15
* Move resolving code to ResolveServiceSean McGivern2016-08-121-0/+31