From 69e529480c07431559051acacbb1f2a17b6e345b Mon Sep 17 00:00:00 2001 From: Paul Gascou-Vaillancourt Date: Thu, 30 Apr 2020 09:00:34 -0400 Subject: [PATCH 1/3] Upgrade Bootstrap to v4.4.1 --- package.json | 4 ++-- yarn.lock | 42 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index c1f20c3fc8dd4f..8e60064f29f490 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@babel/preset-env": "^7.8.4", "@gitlab/at.js": "1.5.5", "@gitlab/svgs": "1.137.0", - "@gitlab/ui": "16.2.0", + "@gitlab/ui": "16.2.1", "@gitlab/visual-review-tools": "1.6.1", "@rails/actioncable": "^6.0.3-1", "@sentry/browser": "^5.10.2", @@ -58,7 +58,7 @@ "axios": "^0.19.0", "babel-loader": "^8.0.6", "babel-plugin-lodash": "^3.3.4", - "bootstrap": "4.3.1", + "bootstrap": "4.4.1", "brace-expansion": "^1.1.8", "cache-loader": "^4.1.0", "classlist-polyfill": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index ef03db616ce3f0..d1452bd6f0a52a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -787,14 +787,14 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.137.0.tgz#49fb1f33340cfdf0a47c83b7a613e3c7306dd53c" integrity sha512-dhyiedyTKYJt/mXV+PjfY2pivAAPh3BAOHpVzNCZj6HmJ9VZFIJDzOAQTTxlxRz4UyPmHPuCiaal63q+JfLzcQ== -"@gitlab/ui@16.2.0": - version "16.2.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-16.2.0.tgz#b187b54e2757c59473834114aceb886697abcae1" - integrity sha512-9x+b8l2guCFAtvBA/kf8y6oDs1vsPbOxVpxaSDbf/yV0A4w/bxsIjtN0kBacntTlhmK73yNBmydfhOB4Il8xrg== +"@gitlab/ui@16.2.1": + version "16.2.1" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-16.2.1.tgz#52d1a7e21b36e8cdb2766a945d928c8815956449" + integrity sha512-JPkJUp9iyhS+u465qEMcVn9ZhZC7LqXjFBsTpF+plY9LuQWxNSEV9LU1WJ6lR1UsyNAQCJJ04qt9VgkxG52S7Q== dependencies: "@babel/standalone" "^7.0.0" "@gitlab/vue-toasted" "^1.3.0" - bootstrap-vue "2.1.0" + bootstrap-vue "2.13.1" copy-to-clipboard "^3.0.8" echarts "^4.2.1" highlight.js "^9.13.1" @@ -2213,21 +2213,21 @@ bonjour@^3.5.0: multicast-dns "^6.0.1" multicast-dns-service-types "^1.1.0" -bootstrap-vue@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz#41c0cd265a6cea14ffe29eeea71543ec396d1789" - integrity sha512-dftb5fc42x7QLv814nN+3Cx8MMuCB+xrGQjOmSXH81ET0+yo7KYb4lUN3/pOnf+8Tkv8oaawZ1OOth5/AZfktg== +bootstrap-vue@2.13.1: + version "2.13.1" + resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.13.1.tgz#dcefca78f2b0345508fbb85adb0a9897cce65fa1" + integrity sha512-FF1GLRvvj+TgpLkMG/A8+tCMQfWnfKpsPqt7s097VTX2lZv2/YmyhehRC1qraPHYqT7qQVy48TCxSw1H8hNh3Q== dependencies: "@nuxt/opencollective" "^0.3.0" - bootstrap ">=4.3.1 <5.0.0" - popper.js "^1.16.0" - portal-vue "^2.1.6" + bootstrap ">=4.4.1 <5.0.0" + popper.js "^1.16.1" + portal-vue "^2.1.7" vue-functional-data-merge "^3.1.0" -bootstrap@4.3.1, "bootstrap@>=4.3.1 <5.0.0": - version "4.3.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" - integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag== +bootstrap@4.4.1, "bootstrap@>=4.4.1 <5.0.0": + version "4.4.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01" + integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA== boxen@^4.2.0: version "4.2.0" @@ -8910,15 +8910,15 @@ pofile@^1: resolved "https://registry.yarnpkg.com/pofile/-/pofile-1.0.11.tgz#35aff58c17491d127a07336d5522ebc9df57c954" integrity sha512-Vy9eH1dRD9wHjYt/QqXcTz+RnX/zg53xK+KljFSX30PvdDMb2z+c6uDUeblUGqqJgz3QFsdlA0IJvHziPmWtQg== -popper.js@^1.16.0, popper.js@^1.16.1: +popper.js@^1.16.1: version "1.16.1" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== -portal-vue@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz#a7d4790b14a79af7fd159a60ec88c30cddc6c639" - integrity sha512-lvCF85D4e8whd0nN32D8FqKwwkk7nYUI3Ku8UAEx4Z1reomu75dv5evRUTZNaj1EalxxWNXiNl0EHRq36fG8WA== +portal-vue@^2.1.6, portal-vue@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4" + integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g== portfinder@^1.0.25: version "1.0.25" -- GitLab From e11b003ceb282721312825d36658bde5c335ea77 Mon Sep 17 00:00:00 2001 From: Paul Gascou-Vaillancourt Date: Fri, 1 May 2020 13:20:58 -0400 Subject: [PATCH 2/3] Update packages list snapshots --- .../components/__snapshots__/packages_list_app_spec.js.snap | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ee/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap b/ee/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap index c96ec7f94b0da6..2c86544c1262ed 100644 --- a/ee/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap +++ b/ee/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap @@ -13,7 +13,6 @@ exports[`packages_list_app renders 1`] = `