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
dd0fe672
Commit
dd0fe672
authored
Mar 07, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge widget haml partial conflict [ci skip]
parent
d83a5665
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
17 deletions
+0
-17
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
...uests/widget/open/_merge_when_pipeline_succeeds.html.haml
+0
-17
No files found.
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
View file @
dd0fe672
...
...
@@ -4,22 +4,6 @@
%h4
Set by
#{
link_to_member
(
@project
,
@merge_request
.
merge_user
,
avatar:
true
)
}
to be merged automatically when the pipeline succeeds.
<
<<<<<<
HEAD
%div
%p
=
succeed
'.'
do
The
changes
will
be
-
if
@merge_request
.
squash
squashed
and
-
if
@project
.
merge_requests_ff_only_enabled
fast-forward
merged
into
%span
.label-branch
=
@merge_request
.
target_branch
-
if
@merge_request
.
remove_source_branch?
The
source
branch
will
be
removed
.
-
else
The
source
branch
will
not
be
removed
.
==
=====
.remove-message-pipes
%ul
%li
...
...
@@ -34,7 +18,6 @@
%li
%span
The source branch will not be removed.
>
>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
-
remove_source_branch_button
=
!
@merge_request
.
remove_source_branch?
&&
@merge_request
.
can_remove_source_branch?
(
current_user
)
&&
@merge_request
.
merge_user
==
current_user
-
user_can_cancel_automatic_merge
=
@merge_request
.
can_cancel_merge_when_pipeline_succeeds?
(
current_user
)
...
...
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