diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-28 19:54:17 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-28 19:54:17 +0000 |
| commit | 58f088e5442dd0929182f1d91a08cf8c7ff1526a (patch) | |
| tree | a5d2f58435953644f5a4c1e04f64687d681d6b25 | |
| parent | 958a819fce709419c0be76cec8a20c8e8417ab84 (diff) | |
| parent | eb6019308eb168ddad24697efcdeb20325515387 (diff) | |
| download | gitlab-ce-58f088e5442dd0929182f1d91a08cf8c7ff1526a.tar.gz | |
Merge branch 'renovate/gitlab-ui-1.x' into 'master'
Update dependency @gitlab/ui to ^1.22.1
See merge request gitlab-org/gitlab-ce!24734
| -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 0cc40cc800b..571fd2130bd 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.47.0", - "@gitlab/ui": "^1.22.0", + "@gitlab/ui": "^1.22.1", "apollo-boost": "^0.1.20", "apollo-client": "^2.4.5", "autosize": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 44ae576f358..867f2ff46e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,10 +658,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.47.0.tgz#c03dda41aefd3889cbfed95a391836106ae2ac4d" integrity sha512-0Bx/HxqR8xpqqaLnZiFAHIh1jTAFQPFToVZ6Wi3QyhsAwmXRAbgw1SlkRMZ7w3e6l+G71Wnw+GnI4rx1gK8JLQ== -"@gitlab/ui@^1.22.0": - version "1.22.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.22.0.tgz#1926aad1614a8741a5357048ad4576b23289518c" - integrity sha512-2SG8I/bXK9XRDyvYSfzQxOVSfb4FCA2j/pf8YzkGenGGyKnRyp6l4Yx3oPQRiEtHISHmmArBqa+GoEn0FkIB1A== +"@gitlab/ui@^1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-1.22.1.tgz#92ed77216c5702776049b9ac41eb717c1acd864e" + integrity sha512-pWbEaXOOcp8Xt2TjJtPas3lXwWVvizrBOf0M8yN0XAn2GgIRCVnRMpjNEN7/oNeBcEM9CrmPYApEM/hZO+maqQ== dependencies: babel-standalone "^6.26.0" bootstrap-vue "^2.0.0-rc.11" |