summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_service.js
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42GitLab Bot2021-04-201-16/+0
* Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-131-18/+11
* Convert merge_conflict_service.js to axiosPhil Hughes2018-01-301-11/+3
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+31