summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
Commit message (Expand)AuthorAgeFilesLines
* 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
| * resolve all x-spacing and no-spaced-x eslint violationsMike Greiling2017-01-181-2/+2
| * resolve all padded-blocks eslint violationsMike Greiling2017-01-187-19/+7
| * resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-184-13/+13
| * resolve all no-plusplus eslint violationsMike Greiling2017-01-181-11/+11
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-8/+8
|/
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-138-9/+26
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-101-1/+16
* Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-102-19/+1
* Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
* Migrate Vue v1 to v2.Fatih Acet2016-11-101-1/+1
* disable ESLint for all JavaScript fileswinniehell2016-10-269-0/+9
* remove manual Cookie.set "path" option in favor of global settingMike Greiling2016-10-241-3/+1
* replace jquery.cookie vendor script with js.cookieMike Greiling2016-10-241-2/+2
* 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
* Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
View Lorry Controller Status