summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-22 14:49:57 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-22 14:49:57 +0300
commitd2aa48c0d5e49309b14baa5f2f792af945e74bb3 (patch)
treee61a2a0fad29f948fd47cb833aa70fa84c2a9ba4
parent79b76d2cb65fc0411b65cbd8d6614401fd60473e (diff)
downloadgitlab-ce-d2aa48c0d5e49309b14baa5f2f792af945e74bb3.tar.gz
Recreate project satellite on rename or transfer
-rw-r--r--app/models/project.rb1
-rw-r--r--app/services/project_transfer_service.rb3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index b1b7634233c..b505ffb58cf 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -421,6 +421,7 @@ class Project < ActiveRecord::Base
begin
gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
gitlab_shell.rm_satellites(old_path_with_namespace)
+ ensure_satellite_exists
send_move_instructions
rescue
# Returning false does not rollback after_* transaction but gives
diff --git a/app/services/project_transfer_service.rb b/app/services/project_transfer_service.rb
index 3b8c4847f20..8fbf92ff20a 100644
--- a/app/services/project_transfer_service.rb
+++ b/app/services/project_transfer_service.rb
@@ -29,6 +29,9 @@ class ProjectTransferService
# Move wiki repo also if present
gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki")
+ # create satellite repo
+ project.ensure_satellite_exists
+
true
end
end