From 971b89279d400a73d39012e3a5c389eb0d9629d7 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Mon, 19 Nov 2018 14:44:12 -0600
Subject: Upgrade gitlab eslint config to latest

---
 .eslintrc.yml | 5 -----
 package.json  | 2 +-
 yarn.lock     | 8 ++++----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index bc9d2c570db..ecd9f57b075 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -33,8 +33,3 @@ rules:
   vue/no-unused-components: off
   vue/no-use-v-if-with-v-for: off
   vue/no-v-html: off
-  # Disabled due to disagreements with prettier
-  vue/html-closing-bracket-newline: off
-  vue/html-closing-bracket-spacing: off
-  vue/html-indent: off
-  vue/max-attributes-per-line: off
diff --git a/package.json b/package.json
index 7099003cfce..380f44946dc 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "xterm": "^3.5.0"
   },
   "devDependencies": {
-    "@gitlab/eslint-config": "^1.1.0",
+    "@gitlab/eslint-config": "^1.2.0",
     "axios-mock-adapter": "^1.15.0",
     "babel-plugin-istanbul": "^5.1.0",
     "babel-plugin-rewire": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index a3d22bc4b8a..62335ba5e59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -616,10 +616,10 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@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==
+"@gitlab/eslint-config@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.2.0.tgz#115568a70edabbc024f1bc13ba1ba499a9ba05a9"
+  integrity sha512-TnZO5T7JjLQjw30aIGtKIsAX4pRnSbqOir3Ji5zPwtCVWY53DnG6Lcesgy7WYdsnnkt3oQPXFTOZlkymUs2PsA==
   dependencies:
     babel-eslint "^10.0.1"
     eslint-config-airbnb-base "^13.1.0"
-- 
cgit v1.2.1