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

#888 prevent to remove source_branch

Browse source
This commit is contained in:
Zevs 2012-06-05 00:08:41 +03:00
parent 3b41b1839b
commit d6ed9920d6
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,8 +65,9 @@
= 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"
-unless @project.root_ref? @merge_request.source_branch
= 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"