Merge branch 'renovate/gitlab-packages' into 'master'

Update GitLab Packages

See merge request gitlab-org/gitlab!16525

ee/spec/frontend/environments_dashboard/components/__snapshots__/dashboard_spec.js.snap

@@ -5,6 +5,7 @@ exports[`dashboard should match the snapshot 1`] = `
   class="operations-dashboard"
 >
   <glmodal-stub
+    modalclass=""
     modalid="add-projects-modal"
     ok-disabled="true"
     ok-title="Add projects"

ee/spec/javascripts/prometheus_alerts/components/reset_key_spec.js → ee/spec/frontend/prometheus_alerts/components/reset_key_spec.js

@@ -4,6 +4,7 @@ import axios from '~/lib/utils/axios_utils';
 import ResetKey from 'ee/prometheus_alerts/components/reset_key.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import { GlModal } from '@gitlab/ui';
+import waitForPromises from 'helpers/wait_for_promises';
 
 describe('ResetKey', () => {
   let Component;
@@ -47,23 +48,23 @@ describe('ResetKey', () => {
       expect(vm.find('.js-reset-auth-key').text()).toEqual('Reset key');
     });
 
-    it('reset updates key', done => {
+    it('reset updates key', () => {
       mock.onPost(propsData.changeKeyUrl).replyOnce(200, { token: 'newToken' });
 
       vm.find(GlModal).vm.$emit('ok');
 
-      setTimeout(() => {
+      return waitForPromises().then(() => {
+        expect(vm.vm.authorizationKey).toEqual('newToken');
         expect(vm.find('#authorization-key').attributes('value')).toEqual('newToken');
-        done();
       });
     });
 
-    it('reset key failure shows error', done => {
+    it('reset key failure shows error', () => {
       mock.onPost(propsData.changeKeyUrl).replyOnce(500);
 
       vm.find(GlModal).vm.$emit('ok');
 
-      setTimeout(() => {
+      return waitForPromises().then(() => {
         expect(vm.find('#authorization-key').attributes('value')).toEqual(
           propsData.initialAuthorizationKey,
         );
@@ -71,7 +72,6 @@ describe('ResetKey', () => {
         expect(document.querySelector('.flash-container').innerText.trim()).toEqual(
           'Failed to reset key. Please try again.',
         );
-        done();
       });
     });
   });
@@ -89,14 +89,13 @@ describe('ResetKey', () => {
       expect(vm.find('#authorization-key').attributes('value')).toEqual('');
     });
 
-    it('Generate key button triggers key change', done => {
+    it('Generate key button triggers key change', () => {
       mock.onPost(propsData.changeKeyUrl).replyOnce(200, { token: 'newToken' });
 
       vm.find('.js-reset-auth-key').vm.$emit('click');
 
-      setTimeout(() => {
+      return waitForPromises().then(() => {
         expect(vm.find('#authorization-key').attributes('value')).toEqual('newToken');
-        done();
       });
     });
   });

package.json

@@ -37,8 +37,8 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.5.5",
-    "@gitlab/svgs": "^1.72.0",
-    "@gitlab/ui": "5.21.1",
+    "@gitlab/svgs": "^1.73.0",
+    "@gitlab/ui": "5.25.2",
     "@gitlab/visual-review-tools": "1.0.1",
     "apollo-cache-inmemory": "^1.5.1",
     "apollo-client": "^2.5.1",

yarn.lock

@@ -991,19 +991,18 @@
   dependencies:
     vue-eslint-parser "^6.0.4"
 
-"@gitlab/svgs@^1.72.0":
-  version "1.72.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.72.0.tgz#78a29fd383a5a2b31ef91670068a6fea05ba234e"
-  integrity sha512-EVKRqrXsCY6tUiVAh+lpFMJAyNXZwfEqv5NeKH5ginhALMlOunRkY5rsDllyNvgZ0DWHJS1KEKJj2oVU1ouwAg==
+"@gitlab/svgs@^1.73.0":
+  version "1.73.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.73.0.tgz#e44b347e4be77b94474c80cf5c2ee26ca0325c2f"
+  integrity sha512-4on+l5CS8Ae8OOcrnxwkO5s2zq1kHl/YjnOrHaX7megr6jsTYsVzKGaEMe0ViMSIPXA2+QnGD6vElKMkeD2+YQ==
 
-"@gitlab/ui@5.21.1":
-  version "5.21.1"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.21.1.tgz#8215ab3eae4296845596d5b3a987d5460b030569"
-  integrity sha512-TjPVhex9sQGUVwebaJK5XuopDHWx4+Sh9N7yH5u8eXSFWa8vk11voR4qYVt7DZB7powAO/+iiXxYMLLNtXmC/g==
+"@gitlab/ui@5.25.2":
+  version "5.25.2"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.25.2.tgz#599954fefcc228d31a398dbe3c1e2287a0fcdb3e"
+  integrity sha512-mwwvEhVTomnZQjG0dADD+9Kg1UHZXAIb4s5QwQxwpgTkemILYIb1r96oKWfmPe8Pl/xrzAoMUtGEPT3XbxDqYQ==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.2.1"
-    bootstrap "4.3.1"
     bootstrap-vue "2.0.0-rc.27"
     copy-to-clipboard "^3.0.8"
     echarts "^4.2.1"