summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests/conflicts
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42GitLab Bot2022-06-201-2/+0
* Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot2021-07-201-4/+2
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-181-1/+1
* refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-271-2/+5
* remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-272-3/+1
* Remove sidebar bundle webpack entry pointClement Ho2018-02-232-0/+6