diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-04 15:00:01 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-04 15:00:01 +0000 |
| commit | 5e2f7f25eb6ed1118cb541e43026915a7c4cdfef (patch) | |
| tree | fbb893941818f2c9f0f1ce89dd5daf9d67ed00aa /.eslintrc | |
| parent | afbc7520c296196d0f3f95d4a24a9e42c0e41f3c (diff) | |
| parent | 016b9f2565f85b9c77a5a779b64483ca1d4e1776 (diff) | |
| download | gitlab-ce-5e2f7f25eb6ed1118cb541e43026915a7c4cdfef.tar.gz | |
Merge branch 'master' into '33580-fix-api-scoping'
# Conflicts:
# lib/api/users.rb
Diffstat (limited to '.eslintrc')
| -rw-r--r-- | .eslintrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.eslintrc b/.eslintrc index 73cd7ecf66d..c72a5e0335b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,6 +11,7 @@ "gon": false, "localStorage": false }, + "parser": "babel-eslint", "plugins": [ "filenames", "import", |