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

8
lib/gitlab/merge.rb
View file

@ -37,7 +37,7 @@ module Gitlab
unless project.satellite.exists?
raise "You should run: rake gitlab:app:enable_automerge"
end
project.satellite.clear
Dir.chdir(project.satellite.path) do
@ -48,6 +48,12 @@ module Gitlab
merge_repo.git.sh "git config user.email \"#{user.email}\""
merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
#remove source-branch
if merge_request.should_remove_source_branch
merge_repo.git.sh "git push origin :#{merge_request.source_branch}"
end
yield(merge_repo, output)
end
end