summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 06:08:52 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-06 06:08:52 +0000
commitfa478f189009649b115136957e2da30d760fe391 (patch)
tree32933cd0a238da9c942ad2d02c0c56d55cdf03d2 /package.json
parentcfbaef3f1c28cdb9b15615215b87167181cb210f (diff)
downloadgitlab-ce-fa478f189009649b115136957e2da30d760fe391.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'package.json')
-rw-r--r--package.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/package.json b/package.json
index a969fe85ac6..7521958bc74 100644
--- a/package.json
+++ b/package.json
@@ -146,9 +146,9 @@
},
"devDependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.5.0",
- "@gitlab/eslint-config": "^3.0.0",
+ "@gitlab/eslint-config": "^2.1.2",
"@gitlab/eslint-plugin-i18n": "^1.1.0",
- "@gitlab/eslint-plugin-vue-i18n": "^2.0.0",
+ "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
"@vue/test-utils": "^1.0.0-beta.30",
"axios-mock-adapter": "^1.15.0",
"babel-jest": "^24.1.0",
@@ -159,10 +159,10 @@
"commander": "^2.18.0",
"custom-jquery-matchers": "^2.1.0",
"docdash": "^1.0.2",
- "eslint": "~6.8.0",
- "eslint-import-resolver-jest": "^3.0.0",
- "eslint-import-resolver-webpack": "^0.12.1",
- "eslint-plugin-jasmine": "^4.1.0",
+ "eslint": "~5.9.0",
+ "eslint-import-resolver-jest": "^2.1.1",
+ "eslint-import-resolver-webpack": "^0.10.1",
+ "eslint-plugin-jasmine": "^2.10.1",
"eslint-plugin-jest": "^22.3.0",
"eslint-plugin-no-jquery": "^2.3.0",
"gettext-extractor": "^3.4.3",