summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-121-4/+4
* Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-121-4/+4
* Add a project forks spec helperBob Van Landuyt2017-10-071-4/+6
* Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-021-1/+1
* Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-013-5/+5
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-283-0/+587