diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 03:10:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 03:10:34 +0300 |
commit | ba2345d720eac042785d0d5005ff7e2c7d714ced (patch) | |
tree | b09fa7a40aebeab2e009f82d5d3866d324ec1a77 /app/assets/javascripts/issue_show | |
parent | 29471900730296fbd71ba8a24d3d5bc810cd2529 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issue_show')
-rw-r--r-- | app/assets/javascripts/issue_show/components/edit_actions.vue | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index 4ee44e50d2f..14ada5adcf6 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-require-i18n-strings */ +import { GlButton } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; import updateMixin from '../mixins/update'; import eventHub from '../event_hub'; @@ -10,6 +10,9 @@ const issuableTypes = { }; export default { + components: { + GlButton, + }, mixins: [updateMixin], props: { canDestroy: { @@ -64,28 +67,30 @@ export default { <template> <div class="gl-mt-3 gl-mb-3 clearfix"> - <button - :class="{ disabled: formState.updateLoading || !isSubmitEnabled }" + <gl-button + :loading="formState.updateLoading" :disabled="formState.updateLoading || !isSubmitEnabled" - class="btn btn-success float-left qa-save-button" + category="primary" + variant="success" + class="float-left qa-save-button" type="submit" @click.prevent="updateIssuable" > - Save changes - <i v-if="formState.updateLoading" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> - </button> - <button class="btn btn-default float-right" type="button" @click="closeForm"> + {{ __('Save changes') }} + </gl-button> + <gl-button class="float-right" @click="closeForm"> {{ __('Cancel') }} - </button> - <button + </gl-button> + <gl-button v-if="shouldShowDeleteButton" - :class="{ disabled: deleteLoading }" + :loading="deleteLoading" :disabled="deleteLoading" - class="btn btn-danger float-right gl-mr-3 qa-delete-button" - type="button" + category="primary" + variant="danger" + class="float-right gl-mr-3 qa-delete-button" @click="deleteIssuable" > - Delete <i v-if="deleteLoading" class="fa fa-spinner fa-spin" aria-hidden="true"> </i> - </button> + {{ __('Delete') }} + </gl-button> </div> </template> |