From a30011372f9608f688cb490c584e8f380b54c211 Mon Sep 17 00:00:00 2001 From: nicklegr Date: Wed, 25 Mar 2015 21:05:06 +0900 Subject: Reset parking branch to HEAD everytime * Reduces overhead of git checkout --- lib/gitlab/satellite/satellite.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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) -- cgit v1.2.1 From f21bd9b1d59f276db6b83c126960ecd3d7a30dbd Mon Sep 17 00:00:00 2001 From: nicklegr Date: Wed, 25 Mar 2015 22:46:01 +0900 Subject: Update CHANGELOG [ci skip] --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index d4a1346c481..6c2627fc431 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,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) -- cgit v1.2.1