deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ability to remove source branch after merge

Browse source
This commit is contained in:
Zevs 2012-06-03 21:29:20 +03:00
parent 11f72732a8
commit 3b41b1839b
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/merge_requests/show.html.haml
View file

@ -62,9 +62,13 @@
.automerge_widget.can_be_merged{:style => "display:none"}
.alert.alert-success
%span
= link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
 
You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
= form_for [:automerge, @project, @merge_request], :remote => true, :method => :get do |f|
You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
%br
= check_box_tag :should_remove_source_branch
= label_tag :should_remove_source_branch, "Remove source-branch"
= f.submit "Accept Merge Request", :class => "btn small info accept_merge_request"
.automerge_widget.cannot_be_merged{:style => "display:none"}
.alert.alert-info
@ -108,7 +112,7 @@
current_state: "#{@merge_request.human_state}"
});
$(".accept_merge_request").live("ajax:beforeSend", function() {
$(".edit_merge_request").live("ajax:beforeSend", function() {
$(this).replaceWith('#{image_tag "ajax_loader.gif"}');
})
})