summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-23 20:46:36 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-23 20:46:36 +0000
commitfcbf9841c745cc4eb26f7911e273d5a6ae6afd89 (patch)
treec832d8784a5896fdb5b3d62a539e43f3e0409deb /lib
parent9b1bef54de2592997089c6de6f40d67311637f92 (diff)
parent3dbd8d2293bf0ef4a211db2591382113aee48cfc (diff)
downloadgitlab-ce-fcbf9841c745cc4eb26f7911e273d5a6ae6afd89.tar.gz
Merge branch 'always_set_satellite_origin' into 'master'
Always set satellite origin See merge request !1036
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/satellite/satellite.rb1
1 files changed, 1 insertions, 0 deletions
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