summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests/resolve_service_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Auto-correct `RSpec/DescribedClass` violationsrs-described_class-cop-2Robert Speicher2017-05-011-6/+6
* Use `:empty_project` where possible in service specsRobert Speicher2017-03-271-1/+1
* Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-3/+2
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-12/+12
* Fix new offensesDouwe Maan2017-02-231-3/+3
* Enable Style/WordArrayDouwe Maan2017-02-231-4/+4
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-12/+12
* Fix tests to use the new APILin Jen-Shin2016-12-081-1/+7
* Fix resolve service specsSean McGivern2016-10-131-2/+2
* Allow setting content for resolutionsSean McGivern2016-10-131-9/+130
* Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-uiSean McGivern2016-08-301-0/+87