diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-05-06 20:02:45 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-05-06 20:02:45 +0000 |
| commit | 1309e180fad744658ed8de9d912fb4eaf9998be8 (patch) | |
| tree | 4b4ad9c073b349df0aea510c0eb72b6c781c46d0 | |
| parent | b80893c251c462db88d433ebddb9019c2e97a9bc (diff) | |
| parent | 4bbb6d62550a57514f35efbbcbe735bfe6d6d173 (diff) | |
| download | gitlab-ce-1309e180fad744658ed8de9d912fb4eaf9998be8.tar.gz | |
Merge branch 'upgrade-gitlab-ui' into 'master'
Upgrade GitLab UI to 3.10.0
See merge request gitlab-org/gitlab-ce!28140
| -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 dd35c431d6d..eb557101662 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.9.0", "@gitlab/svgs": "^1.60.0", - "@gitlab/ui": "^3.7.0", + "@gitlab/ui": "^3.10.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 798e26cab43..42b6fc642c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -663,10 +663,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.60.0.tgz#c24fe0d40193f4b722e858c2f766b1c80f961cb7" integrity sha512-Io13vB7LMmPHwUXOoHI+dBYRKDoL0E1dw0b+kJOjesFo+uogaggXJJ4WNEGbWTueYyLckv1YhePACG2xgoLWow== -"@gitlab/ui@^3.7.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.7.0.tgz#8d0892ae54ddcb3c309bd970c57a433af6098edf" - integrity sha512-DEIPfem9P5j0DyzZp0M62SbLQu1D4feiNO0oAYN8bJrgiMC8H3VEJwiyplNItSwFYa985O1xOr3B81eTiZEWDQ== +"@gitlab/ui@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.10.0.tgz#0f16772b7fe8052dabd37aba2ae436255b9e0f0a" + integrity sha512-po6fh2T8esa2Nach73AYLdoTg8N0YrRa5GkJk5GoxVrHYoAUD8T1Rn3pXXXKSsQdQcYjIZJ6uvY8sL+qg+Yjww== dependencies: "@babel/standalone" "^7.0.0" "@gitlab/vue-toasted" "^1.2.1" |