Read about our upcoming Code of Conduct on this issue

Commit 99fcb80e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge pull request #9021 from nicklegr/faster_auto_merge

Faster merge request processing for large repository
......@@ -39,6 +39,7 @@ v 7.10.0 (unreleased)
- Link note avatar to user.
- Make Git-over-SSH errors more descriptive.
- Send EmailsOnPush email when branch or tag is created or deleted.
- Faster merge request processing for large repository
v 7.9.0
- Add HipChat integration documentation (Stan Hu)
......
......@@ -99,11 +99,7 @@ def delete_heads!
heads = repo.heads.map(&:name)
# update or create the parking branch
if heads.include? PARKING_BRANCH
repo.git.checkout({}, PARKING_BRANCH)
else
repo.git.checkout(default_options({ b: true }), PARKING_BRANCH)
end
repo.git.checkout(default_options({ B: true }), PARKING_BRANCH)
# remove the parking branch from the list of heads ...
heads.delete(PARKING_BRANCH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment