diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-21 16:53:37 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-21 16:53:37 +0000 |
| commit | a9049532a271117983430d2d80b8ad61879ecf7a (patch) | |
| tree | 14a6675b6b9609a254f0d048fbe24556b3174ea3 | |
| parent | c64f08cad0d50be7f431c2fabace42d6a548d130 (diff) | |
| parent | 7655596bb37153c48ef124f5fcbc1807c06e39e9 (diff) | |
| download | gitlab-ce-a9049532a271117983430d2d80b8ad61879ecf7a.tar.gz | |
Merge branch 'gitlab-ui-1.18.0' into 'master'
Updates gitlab ui to v1.18.0
See merge request gitlab-org/gitlab-ce!23983
| -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 e445fb457a3..1dc9797c59b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@babel/preset-env": "^7.1.0", "@gitlab/csslab": "^1.8.0", "@gitlab/svgs": "^1.43.0", - "@gitlab/ui": "^1.16.0", + "@gitlab/ui": "^1.18.0", "apollo-boost": "^0.1.20", "apollo-client": "^2.4.5", "autosize": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 2ff5a59d769..90d3d6fb7cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -641,10 +641,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.43.0.tgz#28dee2122d068cd3b925cd9884d97465ebaca12d" integrity sha512-wuN3NITmyBV9bOXsFfAjtndFrjTlH6Kf3+6aqT5kHKKLe/B4w7uTU1L9H/cyR0wGD7HbOh584a05eDcuH04fPA== -"@gitlab/ui@^1.16.0": - version "1.16.2" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.16.2.tgz#fecba9f9198db9fa82e922d3c7fe11dd81e3e9a3" - integrity sha512-8m11f9ZQaQZyxmJ6YlgRp0wh94CY95L+Dz5nDFKakwgJA6U5XxQutL1Szip/SCq7u47MXkvQpo5kUQwoAz7K2Q== +"@gitlab/ui@^1.18.0": + version "1.18.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.18.0.tgz#5cc591b2c7958e59fa7b1b443d4235e0e8f956c9" + integrity sha512-JqmiRSGYmK0DbGBQJBpjeRrcgjK25rCqG6QW6/GPTVLtRjbPPZYGvVg5PyA6nJUGAnwFoeApUZVML6X3OpnV1Q== dependencies: babel-standalone "^6.26.0" bootstrap-vue "^2.0.0-rc.11" |