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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
2333bdae
Commit
2333bdae
authored
Mar 06, 2017
by
Regis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MWBS html
parent
d7b5f478
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
9 deletions
+14
-9
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
...uests/widget/open/_merge_when_pipeline_succeeds.html.haml
+14
-9
No files found.
app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
View file @
2333bdae
...
@@ -4,15 +4,20 @@
...
@@ -4,15 +4,20 @@
%h4
%h4
Set by
#{
link_to_member
(
@project
,
@merge_request
.
merge_user
,
avatar:
true
)
}
Set by
#{
link_to_member
(
@project
,
@merge_request
.
merge_user
,
avatar:
true
)
}
to be merged automatically when the pipeline succeeds.
to be merged automatically when the pipeline succeeds.
%div
.remove-message-pipes
%p
%ul
=
succeed
'.'
do
%li
The changes will be merged into
%span
%span
.label-branch
=
@merge_request
.
target_branch
=
succeed
'.'
do
-
if
@merge_request
.
remove_source_branch?
The changes will be merged into
<b>
#{
@merge_request
.
target_branch
}
</b>
The source branch will be removed.
-
if
@merge_request
.
remove_source_branch?
-
else
%li
The source branch will not be removed.
%span
The source branch will be removed.
-
else
%li
%span
The source branch will not be removed.
-
remove_source_branch_button
=
!
@merge_request
.
remove_source_branch?
&&
@merge_request
.
can_remove_source_branch?
(
current_user
)
&&
@merge_request
.
merge_user
==
current_user
-
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
)
-
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