diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-20 12:19:19 -0700 |
| commit | 3d51a6d4351c6a15c92762f5710a967374d0c59b (patch) | |
| tree | 10c5e87e0add51ef0bdcc9be42ac0176907a080c /app/services/projects | |
| parent | 8ec5fb138dde9937814ac138352177399d3e776d (diff) | |
| parent | 8819007c83fdf1ac642836640a37cc541f6eddc6 (diff) | |
| download | gitlab-ce-3d51a6d4351c6a15c92762f5710a967374d0c59b.tar.gz | |
Merge branch 'master' into reply-by-email
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/destroy_service.rb | 1 | ||||
| -rw-r--r-- | app/services/projects/transfer_service.rb | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 403f419ec50..28872c89259 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -27,7 +27,6 @@ module Projects end end - project.satellite.destroy log_info("Project \"#{project.name}\" was removed") system_hook_service.execute_hooks_for(project, :destroy) true diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index f43c0ef70e9..550ed6897dd 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -33,9 +33,6 @@ module Projects raise TransferError.new("Project with same path in target namespace already exists") end - # Remove old satellite - project.satellite.destroy - # Apply new namespace id project.namespace = new_namespace project.save! @@ -51,9 +48,6 @@ module Projects # Move wiki repo also if present gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki") - # Create a new satellite (reload project from DB) - Project.find(project.id).ensure_satellite_exists - # clear project cached events project.reset_events_cache |