Always set the origin remote in satellite actions

This prevents issues with satellites containing outdated origin remotes after administrators move the git repositories directory.

Always set the origin remote in satellite actions
3dbd8d22 · Jacob Vosmaer · abda2dab · 3dbd8d22 · 3dbd8d22
Commit 3dbd8d22 authored Aug 22, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CHANGELOG CHANGELOG +3 -0

satellite.rb lib/gitlab/satellite/satellite.rb +1 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v 7.3.0
+  - Always set the 'origin' remote in satellite actions
+
 v 7.2.0
  - Explore page
  - Add project stars (Ciro Santilli)

--- 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