summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js.es6
Commit message (Expand)AuthorAgeFilesLines
* Remove .es6 from file extensions (!9241)winniehell2017-03-051-13/+0
* resolve all padded-blocks eslint violationsMike Greiling2017-01-181-3/+1
* expand remaining non-explicit eslint-disable blocks and factor out globals wh...Mike Greiling2016-12-131-1/+3
* disable ESLint for all JavaScript fileswinniehell2016-10-261-0/+1
* Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-131-0/+12