Recreate project satellite on rename or transfer

Dmitriy Zaporozhets
1 parent 79b76d2c
Showing 2 changed files with 4 additions and 0 deletions Show diff stats
app/models/project.rb
app/services/project_transfer_service.rb
@@ -421,6 +421,7 @@ class Project &lt; 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
@@ -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
...	...	@@ -421,6 +421,7 @@ class Project < ActiveRecord::Base
421	421	begin
422	422	gitlab_shell.mv_repository("#{old_path_with_namespace}.wiki", "#{new_path_with_namespace}.wiki")
423	423	gitlab_shell.rm_satellites(old_path_with_namespace)
	424	+ ensure_satellite_exists
424	425	send_move_instructions
425	426	rescue
426	427	# Returning false does not rollback after_* transaction but gives
...	...
...	...	@@ -29,6 +29,9 @@ class ProjectTransferService
29	29	# Move wiki repo also if present
30	30	gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki")
31	31
	32	+ # create satellite repo
	33	+ project.ensure_satellite_exists
	34	+
32	35	true
33	36	end
34	37	end
...	...