diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 12:18:03 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 12:18:03 -0700 |
| commit | 99fcb80eb705c47fe7d6d5c7a250de8c00f71146 (patch) | |
| tree | ec59e7d001bea4b973117bf8b66ed0570fd87f21 | |
| parent | 6199da0cb49d2e30071d2bbb08735ce2265c7aff (diff) | |
| parent | f21bd9b1d59f276db6b83c126960ecd3d7a30dbd (diff) | |
| download | gitlab-ce-99fcb80eb705c47fe7d6d5c7a250de8c00f71146.tar.gz | |
Merge pull request #9021 from nicklegr/faster_auto_merge
Faster merge request processing for large repository
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7c3e5dfcb31..9aa6e3530b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 70125d539da..f24c6199c44 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -99,11 +99,7 @@ module Gitlab 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) |