summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/show.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42GitLab Bot2021-10-201-1/+1
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-201-1/+1
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-161-27/+5
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-3/+4
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-2/+0
* Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42GitLab Bot2020-10-211-0/+1
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-1/+1
* Add latest changes from gitlab-org/gitlab@13-2-stable-eeGitLab Bot2020-07-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-131-1/+1
* Add .code to all tables holding diffsDouwe Maan2019-03-261-2/+2
* Code style changes and refactorHeinrich Lee Yu2018-12-201-4/+0
* Pass in just assignees instead of issuableHeinrich Lee Yu2018-12-191-0/+4
* Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-191-1/+1
* remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-271-2/+0
* Chart.html.haml refactorJacob Schatz2018-02-191-2/+2
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-0/+38