deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor Satellite#clear and rename it to clear_and_update!

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-26 01:32:33 +02:00
parent fba8ad5607
commit 0e9d4f30f4
2 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/gitlab/satellite/action.rb
View file

@ -50,10 +50,7 @@ module Gitlab
#
# Note: use this within #in_locked_and_timed_satellite
def prepare_satellite!(repo)
project.satellite.clear
repo.git.reset(hard: true)
repo.git.fetch({}, :origin)
project.satellite.clear_and_update!
repo.git.config({}, "user.name", user.name)
repo.git.config({}, "user.email", user.email)