summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42GitLab Bot2022-10-202-4/+4
* Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42GitLab Bot2022-08-181-4/+3
* Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42GitLab Bot2022-06-201-2/+2
* Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42GitLab Bot2022-04-201-2/+2
* Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42GitLab Bot2022-03-181-4/+3
* Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42GitLab Bot2022-02-182-4/+4
* Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42GitLab Bot2021-12-201-1/+1
* Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42GitLab Bot2021-10-202-2/+10
* Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42GitLab Bot2021-07-202-6/+8
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-194-81/+68
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-2011-621/+137
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-1616-189/+1012
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-185-7/+22
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-204-28/+37
* Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42GitLab Bot2020-12-172-1/+2
* Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42GitLab Bot2020-11-191-23/+15
* Add latest changes from gitlab-org/gitlab@13-3-stable-eeGitLab Bot2020-08-202-2/+2
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-031-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-182-6/+6
* Internationalisation of merge_conflicts directoryBrandon Labuschagne2019-05-022-8/+10
* Add .code to all tables holding diffsDouwe Maan2019-03-261-1/+1
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+2
* Prettify merge_conflicts monitoring and notebook modulesMike Greiling2018-10-103-36/+34
* Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-092-2/+2
* Enable "prefer-destructuring" in JS filesgfyoung2018-06-252-3/+3
* remove all unused eslint-disable rulesLukas Eipert2018-06-202-2/+2
* Removes unused imports and prettifies codefl-reduce-tech-debtFilipa Lacerda2018-06-151-15/+20
* Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-133-7/+22
|\
| * Updates eslint vue plugin versionFilipa Lacerda2018-06-113-7/+22
* | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
|/
* Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-1/+1
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-092-0/+2
* refactor merge conflicts bundle to reduce side effectsMike Greiling2018-02-271-2/+2
* Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
|\
| * Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
* | added missing calls in catch statementsph-axios-2Phil Hughes2018-02-021-0/+1
* | Convert merge_conflict_service.js to axiosPhil Hughes2018-01-302-21/+11
|/
* 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-102-2/+2
* Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-271-1/+1
|\
| * fix conflict pluralizedEmilien Mottet2017-07-241-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 Cookies class from global spaceMike Greiling2017-03-221-1/+1
* remove Vue from the global spaceMike Greiling2017-03-205-6/+10
* Remove .es6 from file extensions (!9241)winniehell2017-03-058-0/+0
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-278-48/+33
|\
| * resolve all prefer-const eslint violationsMike Greiling2017-01-182-10/+8
| * resolve all no-dupe-keys eslint violationsMike Greiling2017-01-181-2/+1
View Lorry Controller Status