summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-03-06 04:45:51 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-03-06 04:45:51 +0000
commit8721be863f3b8fb16ea3c6b559132897b7be310d (patch)
treecb8b61287cb76a5c1c1a95e59ded4bc639b07e71
parentab391b779ecf95b3a333dac0c247354c0ef92605 (diff)
parenta9e0dfe435b97297650bf7d64c4cf9bf6a609d72 (diff)
downloadgitlab-ce-8721be863f3b8fb16ea3c6b559132897b7be310d.tar.gz
Merge branch 'gitlab-ui-2.1.1' into 'master'
Update gitlab-ui to 2.1.1 See merge request gitlab-org/gitlab-ce!25785
-rw-r--r--package.json2
-rw-r--r--yarn.lock30
2 files changed, 21 insertions, 11 deletions
diff --git a/package.json b/package.json
index cd121a5905d..533750e1b52 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"@babel/preset-env": "^7.3.1",
"@gitlab/csslab": "^1.8.0",
"@gitlab/svgs": "^1.54.0",
- "@gitlab/ui": "^2.0.4",
+ "@gitlab/ui": "^2.1.1",
"apollo-boost": "^0.3.1",
"apollo-client": "^2.5.1",
"autosize": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index ac39a27d659..f8d27049c3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -600,6 +600,11 @@
js-levenshtein "^1.1.3"
semver "^5.3.0"
+"@babel/standalone@^7.0.0":
+ version "7.3.4"
+ resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.3.4.tgz#b622c1e522acef91b2a14f22bdcdd4f935a1a474"
+ integrity sha512-4L9c5i4WlGqbrjOVX0Yp8TIR5cEiw1/tPYYZENW/iuO2uI6viY38U7zALidzNfGdZIwNc+A/AWqMEWKeScWkBg==
+
"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
version "7.2.2"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
@@ -658,12 +663,12 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.54.0.tgz#00320e845efd46716042cde0c348b990d4908daf"
integrity sha512-DR17iy8TM5IbXEacqiDP0p8SuC/J8EL+98xbfVz5BKvRsPHpeZJQNlBF/petIV5d+KWM5A9v3GZTY7uMU7z/JQ==
-"@gitlab/ui@^2.0.4":
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.4.tgz#ba86f6e5868ef7bc7f504cef9ca504c2d2f6bffd"
- integrity sha512-dJ+KKpeqIAPYZtYZeciXhC/whNiGPVRjp5IgjQRddh3zsreqmfwQq58nSH7HepAAIepaqTe0UFuzBgrSWvVM6w==
+"@gitlab/ui@^2.1.1":
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.1.1.tgz#e869c0573c0dcd273257fef553feb8e3a056305e"
+ integrity sha512-hK1UIDPXdLlREqXn1Y6VfUSc68R4ZeWOYTEOhd+9Dfnp9RPe8tCWdnWY4nf3U8n1X3EaYgtzI9ho39qnF26nAA==
dependencies:
- babel-standalone "^6.26.0"
+ "@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11"
copy-to-clipboard "^3.0.8"
echarts "^4.2.0-rc.2"
@@ -875,6 +880,8 @@
version "1.7.11"
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
+ dependencies:
+ "@xtuc/long" "4.2.1"
"@webassemblyjs/utf8@1.7.11":
version "1.7.11"
@@ -910,6 +917,11 @@
version "1.7.11"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+ dependencies:
+ "@webassemblyjs/ast" "1.7.11"
+ "@webassemblyjs/helper-buffer" "1.7.11"
+ "@webassemblyjs/wasm-gen" "1.7.11"
+ "@webassemblyjs/wasm-parser" "1.7.11"
"@webassemblyjs/wasm-parser@1.7.11":
version "1.7.11"
@@ -1505,11 +1517,6 @@ babel-runtime@^6.22.0:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
-babel-standalone@^6.26.0:
- version "6.26.0"
- resolved "https://registry.yarnpkg.com/babel-standalone/-/babel-standalone-6.26.0.tgz#15fb3d35f2c456695815ebf1ed96fe7f015b6886"
- integrity sha1-Ffs9NfLEVmlYFevx7Zb+fwFbaIY=
-
babylon@7.0.0-beta.19:
version "7.0.0-beta.19"
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.19.tgz#e928c7e807e970e0536b078ab3e0c48f9e052503"
@@ -9669,6 +9676,9 @@ style-loader@^0.23.1:
version "0.23.1"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
+ dependencies:
+ loader-utils "^1.1.0"
+ schema-utils "^1.0.0"
style-search@^0.1.0:
version "0.1.0"