diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/registry/settings | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/registry/settings')
-rw-r--r-- | app/assets/javascripts/registry/settings/components/settings_form.vue | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/registry/settings/components/settings_form.vue b/app/assets/javascripts/registry/settings/components/settings_form.vue index f129922c1d2..7a26fb5cbee 100644 --- a/app/assets/javascripts/registry/settings/components/settings_form.vue +++ b/app/assets/javascripts/registry/settings/components/settings_form.vue @@ -1,7 +1,7 @@ <script> import { get } from 'lodash'; import { mapActions, mapState, mapGetters } from 'vuex'; -import { GlCard, GlDeprecatedButton, GlLoadingIcon } from '@gitlab/ui'; +import { GlCard, GlButton, GlLoadingIcon } from '@gitlab/ui'; import Tracking from '~/tracking'; import { mapComputed } from '~/vuex_shared/bindings'; import { @@ -14,7 +14,7 @@ import { SET_CLEANUP_POLICY_BUTTON, CLEANUP_POLICY_CARD_HEADER } from '../consta export default { components: { GlCard, - GlDeprecatedButton, + GlButton, GlLoadingIcon, ExpirationPolicyFields, }, @@ -104,24 +104,25 @@ export default { </template> <template #footer> <div class="gl-display-flex gl-justify-content-end"> - <gl-deprecated-button + <gl-button ref="cancel-button" type="reset" class="gl-mr-3 gl-display-block" :disabled="isCancelButtonDisabled" > {{ __('Cancel') }} - </gl-deprecated-button> - <gl-deprecated-button + </gl-button> + <gl-button ref="save-button" type="submit" :disabled="isSubmitButtonDisabled" variant="success" + category="primary" class="gl-display-flex gl-justify-content-center gl-align-items-center js-no-auto-disable" > {{ $options.i18n.SET_CLEANUP_POLICY_BUTTON }} <gl-loading-icon v-if="isLoading" class="gl-ml-3" /> - </gl-deprecated-button> + </gl-button> </div> </template> </gl-card> |