Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/app/models/concerns/storage/legacy_namespace.rb b/app/models/concerns/storage/legacy_namespace.rb
index 42159a8349f..57cb887d12a 100644
--- a/app/models/concerns/storage/legacy_namespace.rb
+++ b/app/models/concerns/storage/legacy_namespace.rb
@@ -25,8 +25,10 @@ module Storage
         Gitlab::UploadsTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path)
 
         if ::Feature.enabled?(:async_pages_move_namespace_transfer, self)
-          run_after_commit do
-            Gitlab::PagesTransfer.new.async.move_namespace(path, former_parent_full_path, parent_full_path)
+          if any_project_with_pages_deployed?
+            run_after_commit do
+              Gitlab::PagesTransfer.new.async.move_namespace(path, former_parent_full_path, parent_full_path)
+            end
           end
         else
           Gitlab::PagesTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path)
@@ -35,10 +37,12 @@ module Storage
         Gitlab::UploadsTransfer.new.rename_namespace(full_path_before_last_save, full_path)
 
         if ::Feature.enabled?(:async_pages_move_namespace_rename, self)
-          full_path_was = full_path_before_last_save
+          if any_project_with_pages_deployed?
+            full_path_was = full_path_before_last_save
 
-          run_after_commit do
-            Gitlab::PagesTransfer.new.async.rename_namespace(full_path_was, full_path)
+            run_after_commit do
+              Gitlab::PagesTransfer.new.async.rename_namespace(full_path_was, full_path)
+            end
           end
         else
           Gitlab::PagesTransfer.new.rename_namespace(full_path_before_last_save, full_path)