2012-06-29 20:55:22 +02:00
|
|
|
- unless can?(current_user, :accept_mr, @project)
|
|
|
|
.alert-message
|
|
|
|
%strong Only masters can accept MR
|
|
|
|
|
|
|
|
|
|
|
|
- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
|
2012-08-11 00:07:50 +02:00
|
|
|
.automerge_widget.can_be_merged{style: "display:none"}
|
2012-06-29 20:55:22 +02:00
|
|
|
.alert.alert-success
|
|
|
|
%span
|
2012-08-11 00:07:50 +02:00
|
|
|
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
|
2012-06-29 20:55:22 +02:00
|
|
|
%p
|
|
|
|
You can accept this request automatically.
|
|
|
|
If you still want to do it manually -
|
2012-08-11 00:07:50 +02:00
|
|
|
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
|
2012-06-29 20:55:22 +02:00
|
|
|
for instructions
|
|
|
|
.accept_group
|
2012-08-11 00:07:50 +02:00
|
|
|
= f.submit "Accept Merge Request", class: "btn small success accept_merge_request"
|
2012-06-29 20:55:22 +02:00
|
|
|
- unless @project.root_ref? @merge_request.source_branch
|
|
|
|
.remove_branch_holder
|
2012-08-11 00:07:50 +02:00
|
|
|
= label_tag :should_remove_source_branch, class: "checkbox" do
|
2012-06-29 20:55:22 +02:00
|
|
|
= check_box_tag :should_remove_source_branch
|
|
|
|
Remove source-branch
|
|
|
|
.clearfix
|
|
|
|
|
|
|
|
|
2012-08-11 00:07:50 +02:00
|
|
|
.automerge_widget.cannot_be_merged{style: "display:none"}
|
2012-06-29 20:55:22 +02:00
|
|
|
.alert.alert-info
|
|
|
|
%span
|
2012-08-11 00:07:50 +02:00
|
|
|
= link_to "Show how to merge", "#", class: "how_to_merge_link btn small padded", title: "How To Merge"
|
2012-06-29 20:55:22 +02:00
|
|
|
|
2012-08-11 01:47:54 +02:00
|
|
|
%strong This request can't be merged with GitLab. You should do it manually
|
2012-06-29 20:55:22 +02:00
|
|
|
|
|
|
|
.automerge_widget.unchecked
|
|
|
|
.alert-message
|
|
|
|
%strong
|
|
|
|
%i.icon-refresh
|
|
|
|
Checking for ability to automatically merge…
|
|
|
|
|
2012-08-11 00:07:50 +02:00
|
|
|
.automerge_widget.already_cannot_be_merged{style: "display:none"}
|
2012-06-29 20:55:22 +02:00
|
|
|
.alert.alert-info
|
|
|
|
%strong This merge request already can not be merged. Try to reload page.
|
|
|
|
|