Commit a98faad0 authored by Mike Greiling's avatar Mike Greiling

Migrate "remove source branch" to GlFormCheckbox

parent f8a03467
...@@ -5,6 +5,7 @@ import { ...@@ -5,6 +5,7 @@ import {
GlButtonGroup, GlButtonGroup,
GlDropdown, GlDropdown,
GlDropdownItem, GlDropdownItem,
GlFormCheckbox,
GlSprintf, GlSprintf,
GlLink, GlLink,
GlTooltipDirective, GlTooltipDirective,
...@@ -81,6 +82,7 @@ export default { ...@@ -81,6 +82,7 @@ export default {
GlButtonGroup, GlButtonGroup,
GlDropdown, GlDropdown,
GlDropdownItem, GlDropdownItem,
GlFormCheckbox,
GlSkeletonLoader, GlSkeletonLoader,
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'),
...@@ -495,16 +497,15 @@ export default { ...@@ -495,16 +497,15 @@ export default {
</gl-button-group> </gl-button-group>
<div class="media-body-wrap space-children"> <div class="media-body-wrap space-children">
<template v-if="shouldShowMergeControls"> <template v-if="shouldShowMergeControls">
<label v-if="canRemoveSourceBranch"> <gl-form-checkbox
<input v-if="canRemoveSourceBranch"
id="remove-source-branch-input" id="remove-source-branch-input"
v-model="removeSourceBranch" v-model="removeSourceBranch"
:disabled="isRemoveSourceBranchButtonDisabled" :disabled="isRemoveSourceBranchButtonDisabled"
class="js-remove-source-branch-checkbox" class="js-remove-source-branch-checkbox gl-min-h-7 gl-display-flex gl-align-items-center gl-mr-2"
type="checkbox" >
/>
{{ __('Delete source branch') }} {{ __('Delete source branch') }}
</label> </gl-form-checkbox>
<!-- Placeholder for EE extension of this component --> <!-- Placeholder for EE extension of this component -->
<squash-before-merge <squash-before-merge
......
...@@ -44,7 +44,7 @@ export default { ...@@ -44,7 +44,7 @@ export default {
:checked="value" :checked="value"
:disabled="isDisabled" :disabled="isDisabled"
name="squash" name="squash"
class="qa-squash-checkbox js-squash-checkbox gl-mb-0 gl-mr-2" class="qa-squash-checkbox js-squash-checkbox gl-min-h-7 gl-display-flex gl-align-items-center gl-mr-2"
:title="tooltipTitle" :title="tooltipTitle"
@change="(checked) => $emit('input', checked)" @change="(checked) => $emit('input', checked)"
> >
......
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