summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-01-28 12:06:03 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-01-28 12:06:03 +0000
commit6b67eb5bff72bfb6441a74571b9e37e553ff843a (patch)
treec75c9b21a4839fcc41355a8ab4f7abe3e2283217
parent52b07c80ba3367764eb6288cb6323d6e21ef4d1c (diff)
parente0609d8fb4389171a847000139f1412b0748aab6 (diff)
downloadgitlab-ce-6b67eb5bff72bfb6441a74571b9e37e553ff843a.tar.gz
Merge branch 'renovate/gitlab-ui-1.x' into 'master'
Update dependency @gitlab/ui to ^1.22.0 See merge request gitlab-org/gitlab-ce!24721
-rw-r--r--package.json2
-rw-r--r--yarn.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json
index 82c15f90745..0cc40cc800b 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"@babel/preset-env": "^7.3.1",
"@gitlab/csslab": "^1.8.0",
"@gitlab/svgs": "^1.47.0",
- "@gitlab/ui": "^1.20.0",
+ "@gitlab/ui": "^1.22.0",
"apollo-boost": "^0.1.20",
"apollo-client": "^2.4.5",
"autosize": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index dd027355865..44ae576f358 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -658,10 +658,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.47.0.tgz#c03dda41aefd3889cbfed95a391836106ae2ac4d"
integrity sha512-0Bx/HxqR8xpqqaLnZiFAHIh1jTAFQPFToVZ6Wi3QyhsAwmXRAbgw1SlkRMZ7w3e6l+G71Wnw+GnI4rx1gK8JLQ==
-"@gitlab/ui@^1.20.0":
- version "1.20.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.20.0.tgz#50bd4b092646a2c6337f0f462779af8e702dda05"
- integrity sha512-EJgrqon/tYCUPoOgnNNAXbrDXOEAajJwKHr4aR2R6vkJI3kVZiq66RNIe5ftGIUoNqYCDnRIkpLyo7MqzJPgcw==
+"@gitlab/ui@^1.22.0":
+ version "1.22.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.22.0.tgz#1926aad1614a8741a5357048ad4576b23289518c"
+ integrity sha512-2SG8I/bXK9XRDyvYSfzQxOVSfb4FCA2j/pf8YzkGenGGyKnRyp6l4Yx3oPQRiEtHISHmmArBqa+GoEn0FkIB1A==
dependencies:
babel-standalone "^6.26.0"
bootstrap-vue "^2.0.0-rc.11"