Merge branch 'ce-to-ee-2018-10-16' into 'master'

CE upstream - 2018-10-16 22:21 UTC

See merge request gitlab-org/gitlab-ee!7959

.eslintrc.yml

-env:
-  browser: true
-  es6: true
 extends:
-  - airbnb-base
-  - prettier
-  - plugin:vue/recommended
+  - '@gitlab'
 globals:
   __webpack_public_path__: true
   gl: false
   gon: false
   localStorage: false
-parserOptions:
-  parser: babel-eslint
 plugins:
-  - filenames
   - import
   - html
-  - promise
 settings:
   html/html-extensions:
     - '.html'
@@ -25,38 +16,12 @@ settings:
     webpack:
       config: './config/webpack.config.js'
 rules:
-  filenames/match-regex:
-    - error
-    - '^[a-z0-9_]+$'
   import/no-commonjs: error
-  promise/catch-or-return: error
-  no-param-reassign:
-    - error
-    - props: true
-      ignorePropertyModificationsFor:
-        - 'acc' # for reduce accumulators
-        - 'accumulator' # for reduce accumulators
-        - 'el' # for DOM elements
-        - 'element' # for DOM elements
-        - 'state' # for Vuex mutations
   no-underscore-dangle:
     - error
     - allow:
         - __
         - _links
-  no-mixed-operators: off
-  vue/html-self-closing:
-    - error
-    - html:
-        void: always
-        normal: never
-        component: always
-      svg: always
-      math: always
-  camelcase:
-    - error
-    - properties: never
-      ignoreDestructuring: true
   # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
   no-else-return:
     - error

package.json

@@ -113,8 +113,8 @@
     "xterm": "^3.5.0"
   },
   "devDependencies": {
+    "@gitlab/eslint-config": "^1.1.0",
     "axios-mock-adapter": "^1.15.0",
-    "babel-eslint": "^9.0.0",
     "babel-plugin-istanbul": "^5.1.0",
     "babel-plugin-rewire": "^1.2.0",
     "babel-template": "^6.26.0",
@@ -122,15 +122,10 @@
     "chalk": "^2.4.1",
     "commander": "^2.18.0",
     "eslint": "~5.6.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-config-prettier": "^3.1.0",
     "eslint-import-resolver-webpack": "^0.10.1",
-    "eslint-plugin-filenames": "^1.3.2",
     "eslint-plugin-html": "4.0.5",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-jasmine": "^2.10.1",
-    "eslint-plugin-promise": "^4.0.1",
-    "eslint-plugin-vue": "^5.0.0-beta.3",
     "gettext-extractor": "^3.3.2",
     "gettext-extractor-vue": "^4.0.1",
     "ignore": "^3.3.7",

yarn.lock

@@ -630,6 +630,19 @@
     bootstrap-vue "^2.0.0-rc.11"
     vue "^2.5.16"
 
+"@gitlab/eslint-config@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.1.0.tgz#9757764b3a78b6bacfbcd9533331cb6345ffdd59"
+  integrity sha512-tTdHj8nmZbgl7ygzZYYgfETgvFX/+Z/xA5abqbmwcejpI4fmJUhQwERTHu7P+NwQ2ywzPCS6dO4LljlT/r1jBw==
+  dependencies:
+    babel-eslint "^10.0.1"
+    eslint-config-airbnb-base "^13.1.0"
+    eslint-config-prettier "^3.1.0"
+    eslint-plugin-filenames "^1.3.2"
+    eslint-plugin-import "^2.14.0"
+    eslint-plugin-promise "^4.0.1"
+    eslint-plugin-vue "^5.0.0-beta.3"
+
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -1136,10 +1149,10 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-eslint@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-9.0.0.tgz#7d9445f81ed9f60aff38115f838970df9f2b6220"
-  integrity sha512-itv1MwE3TMbY0QtNfeL7wzak1mV47Uy+n6HtSOO4Xd7rvmO+tsGQSgyOEEgo6Y2vHZKZphaoelNeSVj4vkLA1g==
+babel-eslint@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed"
+  integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"