summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-10-27 19:42:41 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-10-27 19:42:41 +0000
commit85bd6296a72194f9d044829456616195765611c4 (patch)
tree9dd97653a637a6f4de1c168ab5b9d52600f1523a /app/models/user.rb
parent4635b47a115a82faa564160225d66e1d7abb7d6d (diff)
parent4060807719a9d721248ce910cf4bf50e2838a498 (diff)
downloadgitlab-ce-85bd6296a72194f9d044829456616195765611c4.tar.gz
Merge branch 'fix-linting' into 'master'
Enable linting for ES6 files ## What does this MR do? Add `.js.es6` to file extensions checked by ESLint. ## What are the relevant issue numbers? Follows !5445 See merge request !7156
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions