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

2
lib/gitlab/merge.rb
View file

@ -50,7 +50,7 @@ module Gitlab
output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
#remove source-branch
if merge_request.should_remove_source_branch
if merge_request.should_remove_source_branch && !project.root_ref?(merge_request.source_branch)
merge_repo.git.sh "git push origin :#{merge_request.source_branch}"
end