Commit 41ceb4ca authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '219910-security-dismissal-button' into 'master'

Remove deprecated button from security comment dismissal

Closes #229208 and #219910

See merge request gitlab-org/gitlab!38596
parents d3ffc4bc a2b19635
<script> <script>
import { escape } from 'lodash'; import { escape } from 'lodash';
import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue'; import EventItem from 'ee/vue_shared/security_reports/components/event_item.vue';
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
export default { export default {
components: { components: {
EventItem, EventItem,
GlDeprecatedButton, GlButton,
LoadingButton,
}, },
props: { props: {
feedback: { feedback: {
...@@ -118,15 +116,12 @@ export default { ...@@ -118,15 +116,12 @@ export default {
<template #right-content> <template #right-content>
<div class="d-flex flex-grow-1 align-self-start flex-row-reverse"> <div class="d-flex flex-grow-1 align-self-start flex-row-reverse">
<loading-button <gl-button category="primary" variant="danger" @click="$emit('deleteDismissalComment')">
:label="__('Delete comment')" {{ __('Delete comment') }}
container-class="btn btn-remove" </gl-button>
@click="$emit('deleteDismissalComment')" <gl-button class="mr-2" @click="$emit('hideDismissalDeleteButtons')">
/>
<gl-deprecated-button class="mr-2" @click="$emit('hideDismissalDeleteButtons')">
{{ __('Cancel') }} {{ __('Cancel') }}
</gl-deprecated-button> </gl-button>
</div> </div>
</template> </template>
</event-item> </event-item>
......
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