summaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-22 19:58:46 +0000
committerFatih Acet <acetfatih@gmail.com>2016-11-22 19:58:46 +0000
commit7b252e878f841981dcd1ad1525b98a4169db0070 (patch)
tree3b51b780383d14c3e4d82c24c06ac66f12c7ee56 /package.json
parentc3f858b764d684321e3c0f149f0eb59029ef04e8 (diff)
parent855567ac587178de56d7a177c7b5e2243bbb030d (diff)
downloadgitlab-ce-7b252e878f841981dcd1ad1525b98a4169db0070.tar.gz
Merge branch '24754-fix-npm-warnings-for-eslint-plugin-import' into 'master'
Fix NPM install warnings due to incompatible dependency version ## What does this MR do? Rolls back `eslint-plugin-import` to semver `^1.16.0` for compatibility with `eslint-config-airbnb`. ## Are there points in the code the reviewer needs to double check? Shouldn't be. ## Why was this MR needed? A warning message was being generated every time we run `npm install`, and there are possibly other side effects due to module incompatibility. ## Does this MR meet the acceptance criteria? - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) ## What are the relevant issue numbers? Closes #24754 See merge request !7641
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 2a9fb808eef..3d0e21b9848 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"eslint": "^3.1.1",
"eslint-config-airbnb": "^12.0.0",
"eslint-plugin-filenames": "^1.1.0",
- "eslint-plugin-import": "^2.0.1",
+ "eslint-plugin-import": "^1.16.0",
"eslint-plugin-jasmine": "^1.8.1",
"eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.4.1",