summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-161-11/+0
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-10/+5
* Update copy; add monospace font to branch namesAnnabel Dunstone Gray2018-05-211-2/+2
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-311-4/+4
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-6/+2
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+1
* Refactor JS codeAlfredo Sumaran2016-10-131-3/+3
* Fix hard coded plural text.Fatih Acet2016-08-131-1/+1
* “Showing N conflicts for A into B” -> “Showing N conflicts between A an...Douwe Maan2016-08-121-2/+2
* Separate inline haml vue templates into new files.Fatih Acet2016-08-121-0/+20