Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 21:42:06 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-20 21:42:06 +0300
commit6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch)
tree78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
parent1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff)
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue')
-rw-r--r--app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue21
1 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
index 71df677c7fd..e09b8e1bdd5 100644
--- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
+++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
@@ -1,12 +1,12 @@
<script>
import { escape } from 'lodash';
-import { GlModal, GlDeprecatedButton, GlFormInput } from '@gitlab/ui';
+import { GlModal, GlButton, GlFormInput } from '@gitlab/ui';
import { s__, sprintf } from '~/locale';
export default {
components: {
GlModal,
- GlDeprecatedButton,
+ GlButton,
GlFormInput,
},
props: {
@@ -122,15 +122,18 @@ export default {
</form>
</template>
<template #modal-footer>
- <gl-deprecated-button variant="secondary" @click="onCancel">{{
- s__('Cancel')
- }}</gl-deprecated-button>
- <gl-deprecated-button :disabled="!canSubmit" variant="warning" @click="onSecondaryAction">
+ <gl-button @click="onCancel">{{ s__('Cancel') }}</gl-button>
+ <gl-button
+ :disabled="!canSubmit"
+ category="primary"
+ variant="warning"
+ @click="onSecondaryAction"
+ >
{{ secondaryAction }}
- </gl-deprecated-button>
- <gl-deprecated-button :disabled="!canSubmit" variant="danger" @click="onSubmit">{{
+ </gl-button>
+ <gl-button :disabled="!canSubmit" category="primary" variant="danger" @click="onSubmit">{{
action
- }}</gl-deprecated-button>
+ }}</gl-button>
</template>
</gl-modal>
</template>