summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-04-15 21:53:16 +0000
committerFatih Acet <acetfatih@gmail.com>2019-04-15 21:53:16 +0000
commit65b38bf542c64d4ae19688fe4fdffa1060a1153a (patch)
tree6b808d50eeaeca930e7511bd2168ef7254eec7c2
parent31cd4c6e4da8c29573a0a302e64beb4659a99c0e (diff)
parent3b3f01f101272058f16b7ca1d89428a2d1925f06 (diff)
downloadgitlab-ce-65b38bf542c64d4ae19688fe4fdffa1060a1153a.tar.gz
Merge branch 'renovate/gitlab-ui-3.x' into 'master'
Update dependency @gitlab/ui to ^3.3.0 See merge request gitlab-org/gitlab-ce!27321
-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 115f6fd1e8d..1cb9f7a9ade 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.59.0",
- "@gitlab/ui": "^3.2.0",
+ "@gitlab/ui": "^3.3.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 41758181610..ebbb670db0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -663,10 +663,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.59.0.tgz#affcf9596d736836d37469bb4aea2226ac03e087"
integrity sha512-dokGyyLRRsoBKO70KP1g+ZsDGyTK/RIHWDmvWI6Bx5AxQ3UqAzVXn2OIb3owjJAexyRG1uBmJrriiVVyHznQ4g==
-"@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==
+"@gitlab/ui@^3.3.0":
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.3.0.tgz#32112c8eb53a0fd893f8fa431a02ceaf55279323"
+ integrity sha512-VVInZmcAe0L0lRMb6II3ED4DYm4OpzSmcxdwt18CqpDMw3EEoUqxd58EAxBFy70isgFTd6cHYhyS8rw5GOULyg==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "^2.0.0-rc.11"