summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-04-08 05:47:05 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-04-08 05:47:05 +0000
commitdfb26f007c34cd298347701d637a41cbb5ffc7ad (patch)
tree3301bcf0c59e22d0dda0d8a920b23faee56b0bd3
parent6b8f6075b785ae91d3319ab19361f04ab2ade9b9 (diff)
parent76714acdd2049445b11b5d5c191023735a4af090 (diff)
downloadgitlab-ce-dfb26f007c34cd298347701d637a41cbb5ffc7ad.tar.gz
Merge branch 'renovate/gitlab-ui-3.x' into 'master'
Update dependency @gitlab/ui to ^3.2.0 See merge request gitlab-org/gitlab-ce!27077
-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 54962834e71..6d3e6764a46 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"@babel/preset-env": "^7.3.1",
"@gitlab/csslab": "^1.9.0",
"@gitlab/svgs": "^1.58.0",
- "@gitlab/ui": "^3.1.0",
+ "@gitlab/ui": "^3.2.0",
"apollo-cache-inmemory": "^1.5.1",
"apollo-client": "^2.5.1",
"apollo-upload-client": "^10.0.0",
diff --git a/yarn.lock b/yarn.lock
index b0ce4d49562..571ac952e90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,10 +663,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.58.0.tgz#bb05263ff2eb7ca09a25cd14d0b1a932d2ea9c2f"
integrity sha512-RlWSjjBT4lMIFuNC1ziCO1nws9zqZtxCjhrqK2DxDDTgp2W0At9M/BFkHp8RHyMCrO3g1fHTrLPUgzr5oR3Epg==
-"@gitlab/ui@^3.1.0":
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.1.0.tgz#718fce208c14dc539859715a03978922c5b003b5"
- integrity sha512-xCz8uCeP/4pzuQSoqfrFLeB0lfVHpvQ08r8/CkhSoDTpv34AXvmaxbv1PR8lIadRi43KuPTN639zHHKC2Z0b1g==
+"@gitlab/ui@^3.2.0":
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.2.0.tgz#3a44ac806a22b87fe45e6edfa410cb9355164f04"
+ integrity sha512-If2ngMIw0jWAdQ1q3PfB8sDhCXz1r3DsRm1X5Vy767kZ2TeFd7SGBp5KP5ceMGGpQ4TTYU/V8IqYnQbTXfPKRw==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11"