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
ec5505f8
Commit
ec5505f8
authored
May 29, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in app/views/shared/issuable/form/merge_params.html.haml.
parent
3b1f2396
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
app/views/shared/issuable/form/_merge_params.html.haml
app/views/shared/issuable/form/_merge_params.html.haml
+10
-10
No files found.
app/views/shared/issuable/form/_merge_params.html.haml
View file @
ec5505f8
...
@@ -6,21 +6,21 @@
...
@@ -6,21 +6,21 @@
-# This check is duplicated below, to avoid conflicts with EE.
-# This check is duplicated below, to avoid conflicts with EE.
-
return
unless
issuable
.
can_remove_source_branch?
(
current_user
)
-
return
unless
issuable
.
can_remove_source_branch?
(
current_user
)
-
if
issuable
.
can_remove_source_branch?
(
current_user
)
.form-group
.col-sm-10.col-sm-offset-2
.checkbox
-
initial_checkbox_value
=
issuable
.
merge_params
.
key?
(
'force_remove_source_branch'
)
?
issuable
.
force_remove_source_branch?
:
true
=
label_tag
'merge_request[force_remove_source_branch]'
do
=
hidden_field_tag
'merge_request[force_remove_source_branch]'
,
'0'
,
id:
nil
=
check_box_tag
'merge_request[force_remove_source_branch]'
,
'1'
,
initial_checkbox_value
Remove source branch when merge request is accepted.
.form-group
.form-group
.col-sm-10.col-sm-offset-2
.col-sm-10.col-sm-offset-2
<
<<<<<<
HEAD
.checkbox
.checkbox
=
label_tag
'merge_request[squash]'
do
=
label_tag
'merge_request[squash]'
do
=
hidden_field_tag
'merge_request[squash]'
,
'0'
,
id:
nil
=
hidden_field_tag
'merge_request[squash]'
,
'0'
,
id:
nil
=
check_box_tag
'merge_request[squash]'
,
'1'
,
issuable
.
squash
=
check_box_tag
'merge_request[squash]'
,
'1'
,
issuable
.
squash
Squash commits when merge request is accepted.
Squash commits when merge request is accepted.
=
link_to
'About this feature'
,
help_page_path
(
'user/project/merge_requests/squash_and_merge'
)
=
link_to
'About this feature'
,
help_page_path
(
'user/project/merge_requests/squash_and_merge'
)
==
=====
-
if
issuable
.
can_remove_source_branch?
(
current_user
)
.checkbox
-
initial_checkbox_value
=
issuable
.
merge_params
.
key?
(
'force_remove_source_branch'
)
?
issuable
.
force_remove_source_branch?
:
true
=
label_tag
'merge_request[force_remove_source_branch]'
do
=
hidden_field_tag
'merge_request[force_remove_source_branch]'
,
'0'
,
id:
nil
=
check_box_tag
'merge_request[force_remove_source_branch]'
,
'1'
,
initial_checkbox_value
Remove
source
branch
when
merge
request
is
accepted
.
>
>>>>>> ce-com/master
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