summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-6/+6
|\
| * resolve all semi and no-extra-semi eslint violationsMike Greiling2017-01-181-6/+6
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-8/+8
|/
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-131-1/+4
* Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
* Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
* disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
* Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-4/+8
* Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+2
* Refactor JS codeAlfredo Sumaran2016-10-131-0/+84