summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-03-06 11:06:50 -0700
committerRegis <boudinot.regis@yahoo.com>2017-03-06 11:06:50 -0700
commit2333bdae595f8578722d4f65814b0f33d1d15aa5 (patch)
tree1810e8190a357fd1ba9fcb21aaf4facef06ba3e6 /app/views/projects/merge_requests/widget
parentd7b5f47884945ef8c35d0ca793c25ed4e1f81fa1 (diff)
downloadgitlab-ce-2333bdae595f8578722d4f65814b0f33d1d15aa5.tar.gz
MWBS html
Diffstat (limited to 'app/views/projects/merge_requests/widget')
-rw-r--r--app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml23
1 files changed, 14 insertions, 9 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
index 40a683d3fbd..e897a5a8581 100644
--- a/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_merge_when_pipeline_succeeds.html.haml
@@ -4,15 +4,20 @@
%h4
Set by #{link_to_member(@project, @merge_request.merge_user, avatar: true)}
to be merged automatically when the pipeline succeeds.
-%div
- %p
- = succeed '.' do
- The changes will be 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
+ %span
+ = succeed '.' do
+ The changes will be merged into <b>#{@merge_request.target_branch}</b>
+ - if @merge_request.remove_source_branch?
+ %li
+ %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
- user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user)