diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-12-13 12:53:35 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-12-13 12:53:35 +0000 |
commit | 2b5b4d922a55f134e0d21a11ff5319d2d3d6f49e (patch) | |
tree | 858dcd53bf318d285e1c7c365c7c709861a7b371 /package.json | |
parent | d7619fd6956a16140a5111e8e0193e52324f221b (diff) | |
parent | 0905792987b72d6735d5bdaecc4ee59a986c0298 (diff) | |
download | gitlab-ce-2b5b4d922a55f134e0d21a11ff5319d2d3d6f49e.tar.gz |
Merge branch 'mg-update-eslint-config' into 'master'
Update eslint dependencies
See merge request gitlab-org/gitlab-ce!23610
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index a04d8268d4f..cf7e43f14dd 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "xterm": "^3.5.0" }, "devDependencies": { - "@gitlab/eslint-config": "^1.2.0", + "@gitlab/eslint-config": "^1.4.0", "@vue/test-utils": "^1.0.0-beta.25", "axios-mock-adapter": "^1.15.0", "babel-core": "^7.0.0-bridge", @@ -131,10 +131,10 @@ "babel-types": "^6.26.0", "chalk": "^2.4.1", "commander": "^2.18.0", - "eslint": "~5.6.0", + "eslint": "~5.9.0", "eslint-import-resolver-jest": "^2.1.1", "eslint-import-resolver-webpack": "^0.10.1", - "eslint-plugin-html": "4.0.5", + "eslint-plugin-html": "5.0.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-jasmine": "^2.10.1", "eslint-plugin-jest": "^22.1.0", |