diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-19 09:23:13 +0300 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-19 09:23:13 +0300 |
commit | 503061217e010e74d155464be7dfd8e9754776db (patch) | |
tree | e1ceabbd5d2489b7d16f28446eb5be0572ceca52 | |
parent | 5bf3b33dee6ee1591bb1fe43f4605e4bcdb707f3 (diff) | |
parent | 8beba47eb0057edc2fac456ff9783b95bc546ea2 (diff) |
Merge branch 'adriel-update-gitlab-ui-version' into 'master'
Update GitLab UI to latest version
See merge request gitlab-org/gitlab-ce!25127
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/package.json b/package.json index 21edd0dcf41..9df2a3ccff7 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.8.0", "@gitlab/svgs": "^1.52.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 47df016b7a6..0111b583404 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,10 +658,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.52.0.tgz#870b0112a18b10d2cde5470a48b05025193cd207" integrity sha512-xqDYIaSY1MJuCa7lRIDTTPoXn6x57So2qchxwmELE+SAJxlYlpYgDKCNWcGawhyTZRDZuG/qFBWp0sMeTQD//A== -"@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" |