summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-1/+3
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
* Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-132-1/+14
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
* Refactor JS codeAlfredo Sumaran2016-10-134-1/+537
* Replace textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
* Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+63