summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-02-04 20:30:21 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-02-04 20:30:21 +0000
commit4b07f22d93de1417ab7918ffd982e35526b50c6e (patch)
tree8bb5bd1f706d41ba78a25609a6a81cd520470a20
parent4d6f447fdc8274f27720a6f3db699c785792ee3a (diff)
parentc7f793087abec41e4ed031336a3e390e20cfca7a (diff)
downloadgitlab-ce-4b07f22d93de1417ab7918ffd982e35526b50c6e.tar.gz
Merge branch 'renovate/gitlab-ui-2.x' into 'master'
Update dependency @gitlab/ui to ^2.0.2 See merge request gitlab-org/gitlab-ce!24915
-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 3f504dc0b0b..cebd4726274 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.48.0",
- "@gitlab/ui": "^2.0.0",
+ "@gitlab/ui": "^2.0.2",
"apollo-boost": "^0.1.20",
"apollo-client": "^2.4.5",
"autosize": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index a55bd26ffd4..1bcdd046cb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -658,10 +658,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.48.0.tgz#7b2e20e357d85aa46e905e6ca51b0b4184ae2794"
integrity sha512-9lRsfqN0W3JxopiXnTzvDY31O465jMTGNKpiOCXy7uAMfwZA6UsRsc7Pp369uKnOLR0duXUGOxOv4NGsK6AeXw==
-"@gitlab/ui@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.0.tgz#96c6845292a037de8b38bec9958e051b9904e52e"
- integrity sha512-TnM+Wf5/0eRxtB02Hblfqx1X6INP+uhRcLoW+nv7Xy0fyy3LIU81EVaCnDEKFddhoK04DzmlUXswRIu59iI5LQ==
+"@gitlab/ui@^2.0.2":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-2.0.2.tgz#611571c931181fb783f57f712e1c2388059b301b"
+ integrity sha512-rUWVhWmM9EkwIEruYJEjizrQKe7TzNyKArwWY/nfEL4HptDtwbe+xHfR8IJHbpql3oI87cTO3BheMxYF6b2Ebg==
dependencies:
babel-standalone "^6.26.0"
bootstrap-vue "^2.0.0-rc.11"