Commit 52efc366 authored by Kevin Comoli's avatar Kevin Comoli Committed by Enrique Alcántara

Convert gl-deprecated-button to gl-button in ready_to_merge.vue

parent 654470c5
<script> <script>
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { GlIcon, GlDeprecatedButton, GlSprintf, GlLink } from '@gitlab/ui'; import { GlIcon, GlButton, GlSprintf, GlLink } from '@gitlab/ui';
import successSvg from 'icons/_icon_status_success.svg'; import successSvg from 'icons/_icon_status_success.svg';
import warningSvg from 'icons/_icon_status_warning.svg'; import warningSvg from 'icons/_icon_status_warning.svg';
import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge'; import readyToMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/ready_to_merge';
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
GlIcon, GlIcon,
GlSprintf, GlSprintf,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
MergeTrainHelperText: () => MergeTrainHelperText: () =>
import('ee_component/vue_merge_request_widget/components/merge_train_helper_text.vue'), import('ee_component/vue_merge_request_widget/components/merge_train_helper_text.vue'),
MergeImmediatelyConfirmationDialog: () => MergeImmediatelyConfirmationDialog: () =>
...@@ -297,16 +297,16 @@ export default { ...@@ -297,16 +297,16 @@ export default {
<div class="media-body"> <div class="media-body">
<div class="mr-widget-body-controls media space-children"> <div class="mr-widget-body-controls media space-children">
<span class="btn-group"> <span class="btn-group">
<gl-deprecated-button <gl-button
size="sm" size="medium"
category="primary"
class="qa-merge-button accept-merge-request" class="qa-merge-button accept-merge-request"
:variant="mergeButtonVariant" :variant="mergeButtonVariant"
:disabled="isMergeButtonDisabled" :disabled="isMergeButtonDisabled"
:loading="isMakingRequest" :loading="isMakingRequest"
@click="handleMergeButtonClick(isAutoMergeAvailable)" @click="handleMergeButtonClick(isAutoMergeAvailable)"
>{{ mergeButtonText }}</gl-button
> >
{{ mergeButtonText }}
</gl-deprecated-button>
<button <button
v-if="shouldShowMergeImmediatelyDropdown" v-if="shouldShowMergeImmediatelyDropdown"
:disabled="isMergeButtonDisabled" :disabled="isMergeButtonDisabled"
......
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