Commit b2a0967e authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'eread/migrate-merge-immediately-dialog' into 'master'

Migrate merge immediately dialog away from deprecated button

Closes #219829

See merge request gitlab-org/gitlab!39284
parents ecbbb276 3dcd4a6d
<script>
import { GlModal, GlDeprecatedButton } from '@gitlab/ui';
import { GlModal, GlButton } from '@gitlab/ui';
import { escape } from 'lodash';
import { __, sprintf } from '~/locale';
......@@ -7,7 +7,7 @@ export default {
name: 'MergeImmediatelyConfirmationDialog',
components: {
GlModal,
GlDeprecatedButton,
GlButton,
},
props: {
docsUrl: {
......@@ -61,14 +61,12 @@ export default {
<p v-html="bodyText"></p>
<p>{{ __('Are you sure you want to merge immediately?') }}</p>
<template #modal-footer>
<gl-deprecated-button ref="cancelButton" @click="cancel">{{
__('Cancel')
}}</gl-deprecated-button>
<gl-deprecated-button
<gl-button ref="cancelButton" @click="cancel">{{ __('Cancel') }}</gl-button>
<gl-button
variant="danger"
data-qa-selector="merge_immediately_button"
@click="mergeImmediately"
>{{ __('Merge immediately') }}</gl-deprecated-button
>{{ __('Merge immediately') }}</gl-button
>
</template>
</gl-modal>
......
---
title: Migrate merge immediately dialog away from deprecated button
merge_request: 39284
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