summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components
Commit message (Expand)AuthorAgeFilesLines
* 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