2012-06-29 20:55:22 +02:00
|
|
|
- unless can?(current_user, :accept_mr, @project)
|
2013-01-30 15:53:18 +01:00
|
|
|
.alert
|
2012-06-29 20:55:22 +02:00
|
|
|
%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
|
2012-12-31 17:35:38 +01:00
|
|
|
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-12-31 17:35:38 +01:00
|
|
|
= f.submit "Accept Merge Request", class: "btn success accept_merge_request"
|
|
|
|
|
- unless @project.root_ref? @merge_request.source_branch
|
2012-06-29 20:55:22 +02:00
|
|
|
.remove_branch_holder
|
2012-12-31 17:35:38 +01: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-12-31 17:35:38 +01:00
|
|
|
|
2012-06-29 20:55:22 +02:00
|
|
|
|
2013-01-05 22:09:26 +01:00
|
|
|
.automerge_widget.no_satellite{style: "display:none"}
|
|
|
|
|
.alert.alert-error
|
|
|
|
|
%span
|
|
|
|
|
%strong This repository does not have satellite. Ask administrator to fix this issue
|
|
|
|
|
|
2012-08-11 00:07:50 +02:00
|
|
|
.automerge_widget.cannot_be_merged{style: "display:none"}
|
2013-01-30 15:53:18 +01:00
|
|
|
.alert.alert-disabled
|
2012-06-29 20:55:22 +02:00
|
|
|
%span
|
2013-01-29 21:29:21 +01:00
|
|
|
= link_to "Show how to merge", "#", class: "how_to_merge_link btn 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
|
2013-01-30 15:53:18 +01:00
|
|
|
.alert
|
2012-06-29 20:55:22 +02:00
|
|
|
%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.
|
|
|
|
|
|
2013-01-05 02:18:39 +01:00
|
|
|
.merge-in-progress.hide
|
2012-08-18 23:45:46 +02:00
|
|
|
%span.cgray Merge is in progress. Please wait. Page will be automatically reloaded.
|
|
|
|
|
= image_tag "ajax_loader.gif"
|
