summaryrefslogtreecommitdiff
path: root/spec/serializers/merge_request_entity_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-10/+0
|\
| * Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-10/+0
* | Add spec for Repository#ff_merge (ported from EE)Valery Sizov2017-09-191-1/+2
|/
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-1/+1
* Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-021-1/+1
* Make commits behind text a link to the target branch commits pageClement Ho2017-07-111-2/+2
* Convert target branch link to use treeClement Ho2017-07-111-1/+1
* Incorporate reviewZ.J. van de Weg2017-05-311-1/+1
* Returns new_blob_path only when user can push_code to projectOswaldo Ferreira2017-05-161-0/+17
* Merge request widget redesignFatih Acet2017-05-091-0/+128