summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflict_store.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-433/+0
* resolve all prefer-const eslint violationsMike Greiling2017-01-181-7/+5
* 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-181-4/+1
* resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-181-3/+3
* 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-131-1/+4
* disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
* 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
* Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-1/+3
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-3/+3
* 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-131-0/+12
* Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-114/+126
* Refactor JS codeAlfredo Sumaran2016-10-131-0/+419