diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-08 18:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-08 18:08:41 +0300 |
commit | dc47d7f5c0f1a402463e9c1adaffecf3f465bc7f (patch) | |
tree | 5fbe362a06ef1841c73d6b377dbccc5dfc7fcece /app/assets/javascripts/environments | |
parent | a0158b1a9c21f648fdbf79765bbc1e19e776b5d9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/environments')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_rollback.vue | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/app/assets/javascripts/environments/components/environment_rollback.vue b/app/assets/javascripts/environments/components/environment_rollback.vue index 4435f726ea1..32528e6c6ea 100644 --- a/app/assets/javascripts/environments/components/environment_rollback.vue +++ b/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> |