diff options
| author | John Skarbek <jskarbek@gitlab.com> | 2019-04-29 19:49:19 +0000 |
|---|---|---|
| committer | John Skarbek <jskarbek@gitlab.com> | 2019-04-29 19:49:19 +0000 |
| commit | 92e0382eacee0d2443ba3a519b8b6ed4ab32392d (patch) | |
| tree | a832c1cef89bf62071c14f9945c5e5f2e339d79d | |
| parent | afe6890df07221dfa00ab3d695e0bdabf380605f (diff) | |
| parent | dc7823cccd135770b9be5b4ba052f8c7db87b47a (diff) | |
| download | gitlab-ce-92e0382eacee0d2443ba3a519b8b6ed4ab32392d.tar.gz | |
Merge branch '11-10-stable-ie11-fix' into '11-10-stable-patch-3'
Update gitlab-ui to 3.2.0-hotfix.1
See merge request gitlab-org/gitlab-ce!27830
| -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 6d3e6764a46..888faa829a8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@babel/preset-env": "^7.3.1", "@gitlab/csslab": "^1.9.0", "@gitlab/svgs": "^1.58.0", - "@gitlab/ui": "^3.2.0", + "@gitlab/ui": "3.2.0-hotfix.1", "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 571ac952e90..3e7e4275e45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -663,10 +663,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.58.0.tgz#bb05263ff2eb7ca09a25cd14d0b1a932d2ea9c2f" integrity sha512-RlWSjjBT4lMIFuNC1ziCO1nws9zqZtxCjhrqK2DxDDTgp2W0At9M/BFkHp8RHyMCrO3g1fHTrLPUgzr5oR3Epg== -"@gitlab/ui@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.2.0.tgz#3a44ac806a22b87fe45e6edfa410cb9355164f04" - integrity sha512-If2ngMIw0jWAdQ1q3PfB8sDhCXz1r3DsRm1X5Vy767kZ2TeFd7SGBp5KP5ceMGGpQ4TTYU/V8IqYnQbTXfPKRw== +"@gitlab/ui@3.2.0-hotfix.1": + version "3.2.0-hotfix.1" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-3.2.0-hotfix.1.tgz#80d3bab994b2a84fd9a61c8fdd06e5ca10547aa1" + integrity sha512-3og6WuXb5JDk+btAS3UuC8PGv/cdu2bisCQ/tpkD0QRNptit2Or96bGEH0hzKxAlSSEzFA3sZlhbxvg/vPLCRg== dependencies: "@babel/standalone" "^7.0.0" bootstrap-vue "^2.0.0-rc.11" |