summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-201-80/+12
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-161-15/+11
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-181-2/+6
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-171-0/+2
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-201-1/+1
* Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-021-1/+2
* Enable "prefer-destructuring" in JS filesgfyoung2018-06-251-1/+1
* Removes unused imports and prettifies codefl-reduce-tech-debtFilipa Lacerda2018-06-151-15/+20
* Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-131-2/+2
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-091-0/+1
* refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-271-2/+2
* added missing calls in catch statementsph-axios-2Phil Hughes2018-02-021-0/+1
* Convert merge_conflict_service.js to axiosPhil Hughes2018-01-301-10/+8
* Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-031-1/+1
* Export old code into es6 modulesFilipa Lacerda2017-12-131-1/+2
* Flash is now a ES6 modulePhil Hughes2017-10-101-1/+1
* fixed label subscription & merge conflictsPhil Hughes2017-07-261-0/+3
* update remaining uses of CJS syntax to ES module syntaxMike Greiling2017-05-161-8/+7
* remove Vue from the global spaceMike Greiling2017-03-201-2/+2
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+92
View Lorry Controller Status