gitlabhq/app/views/merge_requests/show/_mr_accept.html.haml

51 lines
2 KiB
Plaintext
Raw Normal View History

- unless can?(current_user, :accept_mr, @project)
2013-01-30 15:53:18 +01:00
.alert
%strong Only masters can accept MR
2013-02-18 09:40:56 +01:00
- if @merge_request.opened? && @commits.any? && can?(current_user, :accept_mr, @project)
.automerge_widget.can_be_merged{style: "display:none"}
.alert.alert-success
%span
= form_for [:automerge, @project, @merge_request], remote: true, method: :get do |f|
%p
2012-12-31 17:35:38 +01:00
You can accept this request automatically.
If you still want to do it manually -
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
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
.remove_branch_holder
2012-12-31 17:35:38 +01:00
= label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch
Remove source-branch
.clearfix
2012-12-31 17:35:38 +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
.automerge_widget.cannot_be_merged{style: "display:none"}
2013-01-30 15:53:18 +01:00
.alert.alert-disabled
%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-08-11 01:47:54 +02:00
%strong This request can't be merged with GitLab. You should do it manually
.automerge_widget.unchecked
2013-01-30 15:53:18 +01:00
.alert
%strong
%i.icon-refresh
Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged{style: "display:none"}
.alert.alert-info
%strong This merge request already can not be merged. Try to reload page.
.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"