Merge branch '219793-button-fix' into 'master'

Removed GlDeprecatedButton from enviro rollback

Closes #219793

See merge request gitlab-org/gitlab!40751

app/assets/javascripts/environments/components/environment_rollback.vue

@@ -5,21 +5,13 @@
  *
  * Makes a post request when the button is clicked.
  */
-import {
-  GlTooltipDirective,
-  GlLoadingIcon,
-  GlModalDirective,
-  GlDeprecatedButton,
-  GlIcon,
-} from '@gitlab/ui';
+import { GlTooltipDirective, GlModalDirective, GlButton } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import eventHub from '../event_hub';
 
 export default {
   components: {
-    GlIcon,
-    GlLoadingIcon,
-    GlDeprecatedButton,
+    GlButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -73,15 +65,13 @@ export default {
 };
 </script>
 <template>
-  <gl-deprecated-button
+  <gl-button
     v-gl-tooltip
     v-gl-modal.confirm-rollback-modal
-    :disabled="isLoading"
+    class="gl-display-none gl-display-md-block text-secondary"
+    :loading="isLoading"
     :title="title"
-    class="d-none d-md-block text-secondary"
+    :icon="isLastDeployment ? 'repeat' : 'redo'"
     @click="onClick"
-  >
-    <gl-icon v-if="isLastDeployment" name="repeat" /> <gl-icon v-else name="redo" />
-    <gl-loading-icon v-if="isLoading" />
-  </gl-deprecated-button>
+  />
 </template>

spec/frontend/environments/environment_rollback_spec.js

 import { shallowMount, mount } from '@vue/test-utils';
-import { GlDeprecatedButton } from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 import eventHub from '~/environments/event_hub';
 import RollbackComponent from '~/environments/components/environment_rollback.vue';
 
@@ -40,7 +40,7 @@ describe('Rollback Component', () => {
         },
       },
     });
-    const button = wrapper.find(GlDeprecatedButton);
+    const button = wrapper.find(GlButton);
 
     button.vm.$emit('click');