summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/mixins
Commit message (Expand)AuthorAgeFilesLines
* Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-132-32/+20
* Remove .es6 from file extensions (!9241)winniehell2017-03-052-0/+0
* resolve all padded-blocks eslint violationsMike Greiling2017-01-182-4/+2
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-132-2/+4
* disable ESLint for all JavaScript fileswinniehell2016-10-262-0/+2
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-132-0/+30