summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js
Commit message (Expand)AuthorAgeFilesLines
* 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
* Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-1/+2
* Prettify merge_conflicts monitoring and notebook modulesMike Greiling2018-10-101-8/+9
* Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-091-1/+1
* remove all unused eslint-disable rulesLukas Eipert2018-06-201-1/+1
* Updates eslint vue plugin versionFilipa Lacerda2018-06-111-3/+12
* 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-201-1/+2
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-0/+96