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

1
app/controllers/merge_requests_controller.rb
View file

@ -109,6 +109,7 @@ class MergeRequestsController < ApplicationController
def automerge
return access_denied! unless can?(current_user, :accept_mr, @project)
if @merge_request.open? && @merge_request.can_be_merged?
@merge_request.should_remove_source_branch = params[:should_remove_source_branch]
@merge_request.automerge!(current_user)
@status = true
else