Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 8 deletions

diff --git a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
index 9b723ccc3dc..ea3bedf59e0 100644
--- a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
+++ b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
@@ -38,14 +38,14 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
     />
   </form>
    
-  <gl-button-stub
+  <gl-deprecated-button-stub
     size="md"
     variant="secondary"
   >
     Cancel
-  </gl-button-stub>
+  </gl-deprecated-button-stub>
    
-  <gl-button-stub
+  <gl-deprecated-button-stub
     disabled="true"
     size="md"
     variant="warning"
@@ -53,14 +53,14 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
     
       secondaryAction
     
-  </gl-button-stub>
+  </gl-deprecated-button-stub>
    
-  <gl-button-stub
+  <gl-deprecated-button-stub
     disabled="true"
     size="md"
     variant="danger"
   >
     action
-  </gl-button-stub>
+  </gl-deprecated-button-stub>
 </div>
 `;
diff --git a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
index 3efefa8137f..16b0bd305cd 100644
--- a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
+++ b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
-import { GlButton, GlFormInput } from '@gitlab/ui';
+import { GlDeprecatedButton, GlFormInput } from '@gitlab/ui';
 import DeleteUserModal from '~/pages/admin/users/components/delete_user_modal.vue';
 import ModalStub from './stubs/modal_stub';
 
@@ -13,7 +13,7 @@ describe('User Operation confirmation modal', () => {
 
   const findButton = variant =>
     wrapper
-      .findAll(GlButton)
+      .findAll(GlDeprecatedButton)
       .filter(w => w.attributes('variant') === variant)
       .at(0);
   const findForm = () => wrapper.find('form');