Commit Graph

12 Commits

Author SHA1 Message Date
Jarka Kadlecova 064c8949bd CE port of code changed for epics 2017-11-02 07:14:35 +01:00
Andrew Newdigate 47d19c2de1 Stop using `branch_names.include?` and use `branch_exists?` 2017-10-10 14:56:04 +00:00
Douwe Maan 2ee93c486c Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'
Reduce method calls while evaluating Projects::MergeRequestsController#show.json

See merge request gitlab-org/gitlab-ce!14285
2017-10-04 07:33:05 +00:00
Oswaldo Ferreira 1f54c9216f Reduce method calls while evaluating Projects::MergeRequestsController#show.json 2017-10-04 00:09:48 -03:00
Valery Sizov ffa2c5d41e Add spec for Repository#ff_merge (ported from EE) 2017-09-19 23:48:40 -05:00
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Clement Ho 6eeb638434 Make commits behind text a link to the target branch commits page 2017-07-11 11:49:22 -05:00
Clement Ho 09193a4fe1 Convert target branch link to use tree 2017-07-11 09:48:59 -05:00
Z.J. van de Weg 8a9a62e329 Incorporate review 2017-05-31 21:56:18 +02:00
Oswaldo Ferreira 3f6121f2f5 Returns new_blob_path only when user can push_code to project 2017-05-16 15:11:55 +03:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00