diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-22 14:32:04 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-22 14:32:04 +0200 |
| commit | 3dbd8d2293bf0ef4a211db2591382113aee48cfc (patch) | |
| tree | 71ab54d6338852ffd847fa6a01042ec88911230d | |
| parent | abda2dab43cab774ced331093ec7649157a2b5a5 (diff) | |
| download | gitlab-ce-3dbd8d2293bf0ef4a211db2591382113aee48cfc.tar.gz | |
Always set the origin remote in satellite actions
This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4702bed8b09..b35e02268ec 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v 7.3.0 + - Always set the 'origin' remote in satellite actions + v 7.2.0 - Explore page - Add project stars (Ciro Santilli) diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 7c058b58c4c..f34d661c9fc 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -121,6 +121,7 @@ module Gitlab # # Note: this will only update remote branches (i.e. origin/*) def update_from_source! + repo.git.remote(default_options, 'set-url', :origin, project.repository.path_to_repo) repo.git.fetch(default_options, :origin) end |