diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-06-04 17:24:48 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-06-04 17:24:48 +0000 |
| commit | 52b2b32517b3782cd009dc2a209c0eb274ddf3ce (patch) | |
| tree | 419071f26e3624dd898dd40c989e03a709228364 | |
| parent | 4c27abb42f99d65a5611df825a3b35c7db0ecd1c (diff) | |
| parent | 0dfdc62ce5ab657a3f50a9a4b4943fe6cb913192 (diff) | |
| download | gitlab-ce-52b2b32517b3782cd009dc2a209c0eb274ddf3ce.tar.gz | |
Merge branch 'nfriend-update-eslint-config-dependency-version' into 'master'
Bump up @gitlab/eslint-config dependency version to 1.6.0
See merge request gitlab-org/gitlab-ce!29147
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index b4e83475802..f91110efe26 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ }, "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.2.0", - "@gitlab/eslint-config": "^1.5.0", + "@gitlab/eslint-config": "^1.6.0", "@vue/test-utils": "^1.0.0-beta.25", "axios-mock-adapter": "^1.15.0", "babel-jest": "^24.1.0", diff --git a/yarn.lock b/yarn.lock index c8f3e102bc5..155d9910968 100644 --- a/yarn.lock +++ b/yarn.lock @@ -680,10 +680,10 @@ dependencies: bootstrap "^4.1.3" -"@gitlab/eslint-config@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.5.0.tgz#0c8c3ae74f276eb6671bd7c60f331bc0f2d2e5cf" - integrity sha512-KgJgoIZNpGauFpCV1iCptesYN7I8abtYRBLU9xcH0oocC/xp3JmbLfsZ+lEtrk8pl99Q2mKiAuaPpzxjXr6hBw== +"@gitlab/eslint-config@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz#1fd247d6ab477d53d4c330e05f007e3afa303689" + integrity sha512-EZffCwsRZmRWPP6N3wp20EJDVGYLG1v43/W7fF/gYQpUjcRclC8ks/jEv8UppasSDlanDmkh1bLWoE9CelSyyw== dependencies: babel-eslint "^10.0.1" eslint-config-airbnb-base "^13.1.0" |