Commit a353453a authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch...

Merge branch '219818-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-javascripts-vue_shared' into 'master'

Replace GlDeprecatedButton in dismissal_comment_modal_footer.vue

Closes #219818

See merge request gitlab-org/gitlab!38074
parents 0d27a8ae a14d4f4a
<script> <script>
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import Tracking from '~/tracking'; import Tracking from '~/tracking';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue'; import LoadingButton from '~/vue_shared/components/loading_button.vue';
...@@ -7,7 +7,7 @@ import LoadingButton from '~/vue_shared/components/loading_button.vue'; ...@@ -7,7 +7,7 @@ import LoadingButton from '~/vue_shared/components/loading_button.vue';
export default { export default {
name: 'DismissalCommentModalFooter', name: 'DismissalCommentModalFooter',
components: { components: {
GlDeprecatedButton, GlButton,
LoadingButton, LoadingButton,
}, },
props: { props: {
...@@ -65,10 +65,9 @@ export default { ...@@ -65,10 +65,9 @@ export default {
<template> <template>
<div> <div>
<gl-deprecated-button class="js-cancel" @click="$emit('cancel')"> <gl-button variant="default" category="primary" class="js-cancel" @click="$emit('cancel')">
{{ __('Cancel') }} {{ __('Cancel') }}
</gl-deprecated-button> </gl-button>
<loading-button <loading-button
:loading="isDismissingVulnerability" :loading="isDismissingVulnerability"
:disabled="isDismissingVulnerability" :disabled="isDismissingVulnerability"
......
---
title: Replace deprecated button with new button
merge_request: 38074
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment