summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-02-20 16:13:43 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-02-20 16:13:43 +0000
commitd5ab93a655db04aa512e54cb62e3b48e50777744 (patch)
tree2ec770140078e87eba038d44bf940d257e06c9fa
parent902e4f63d6fffe782757bcc3c6c0963e02250eb1 (diff)
parentc42ed3becdd4adb7c4518c536e37f11807e24306 (diff)
downloadgitlab-ce-d5ab93a655db04aa512e54cb62e3b48e50777744.tar.gz
Merge branch 'tr-update-gitlab-ui-2.0.4' into '11-8-stable'
Update GitLab UI to latest version See merge request gitlab-org/gitlab-ce!25428
-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 7110baef8b3..cc4edbfacd8 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.51.0",
- "@gitlab/ui": "^2.0.2",
+ "@gitlab/ui": "^2.0.4",
"apollo-boost": "^0.1.20",
"apollo-client": "^2.4.5",
"autosize": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 9d0ba6640f0..550566bd252 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -658,10 +658,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.51.0.tgz#1b608f68dfb74284401b1cbdb823440f6e8b0091"
integrity sha512-B1Wdhfy5ZClkHuaaCUUZyOBF8CFxxHqxGGhveRekOowtlMExa3tx+YkqNa5XPsEVMF6Aqnh8evQmmN4b+zrHVQ==
-"@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==
+"@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==
dependencies:
babel-standalone "^6.26.0"
bootstrap-vue "^2.0.0-rc.11"