summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Migrate Vue v1 to v2.Fatih Acet2016-11-101-1/+1
* disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
* 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-131-3/+11
* 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