diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/merge.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/merge.rb b/lib/gitlab/merge.rb index 695e41e528d..74ad70b5012 100644 --- a/lib/gitlab/merge.rb +++ b/lib/gitlab/merge.rb @@ -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 |