summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests/conflicts_controller_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42GitLab Bot2022-02-181-1/+1
* Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42GitLab Bot2021-06-161-43/+81
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-1/+1
* Add latest changes from gitlab-org/gitlab@13-1-stable-eeGitLab Bot2020-06-181-1/+1
* Add some frozen string to spec/**/*.rbgfyoung2019-04-151-0/+2
* Update specs to rails5 formatblackst0ne-convert-specs-rails5-styleblackst0ne2018-12-191-17/+25
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+0
* Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* Refactor `have_http_status` into `have_gitlab_http_status` in the specsJacopo2017-10-201-8/+8
* 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
* Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-011-1/+1
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+307