Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a98faad0
Commit
a98faad0
authored
Mar 05, 2021
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate "remove source branch" to GlFormCheckbox
parent
f8a03467
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
...merge_request_widget/components/states/ready_to_merge.vue
+10
-9
app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
..._request_widget/components/states/squash_before_merge.vue
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
View file @
a98faad0
...
@@ -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
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
View file @
a98faad0
...
@@ -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-m
b-0
gl-mr-2"
class=
"qa-squash-checkbox js-squash-checkbox gl-m
in-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)"
>
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment