Commit 2333bdae authored by Regis's avatar Regis

MWBS html

parent d7b5f478
...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment