summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42GitLab Bot2023-03-201-1/+1
* Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42GitLab Bot2022-12-202-2/+2
* Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42GitLab Bot2022-10-201-2/+2
* 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-201-5/+7
* Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42GitLab Bot2021-05-193-17/+21
* Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43GitLab Bot2021-04-203-31/+43
* Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40GitLab Bot2021-03-166-174/+222
* Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42GitLab Bot2021-02-183-4/+15
* Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42Robert Speicher2021-01-203-14/+23
* 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-201-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-181-2/+2
* 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-102-9/+10
* Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-091-1/+1
* remove all unused eslint-disable rulesLukas Eipert2018-06-202-2/+2
* 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-132-5/+9
|/
* Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
* Flash is now a ES6 modulePhil Hughes2017-10-101-1/+1
* remove Vue from the global spaceMike Greiling2017-03-203-3/+6
* Remove .es6 from file extensions (!9241)winniehell2017-03-053-0/+0
* resolve all prefer-const eslint violationsMike Greiling2017-01-181-3/+3
* resolve all padded-blocks eslint violationsMike Greiling2017-01-183-9/+3
* resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-181-2/+2
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-133-4/+12
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-101-1/+16
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-102-19/+1
* Migrate Vue v1 to v2.Fatih Acet2016-11-101-1/+1
* disable ESLint for all JavaScript fileswinniehell2016-10-264-0/+4
* Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
* Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-134-3/+52
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-19/+24
* Refactor JS codeAlfredo Sumaran2016-10-131-1/+4
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+63