Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 30 deletions

diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 56a3c22cd7f..5a1bb2e8b74 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -47,6 +47,7 @@ RSpec.describe Issues::MoveService do
 
         it 'creates a new issue in a new project' do
           expect(new_issue.project).to eq new_project
+          expect(new_issue.namespace_id).to eq new_project.project_namespace_id
         end
 
         it 'copies issue title' do
diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb
index a9329f092fa..442909817e7 100644
--- a/spec/services/projects/after_rename_service_spec.rb
+++ b/spec/services/projects/after_rename_service_spec.rb
@@ -59,22 +59,6 @@ RSpec.describe Projects::AfterRenameService do
         end
       end
 
-      context 'gitlab pages' do
-        before do
-          allow(project_storage).to receive(:rename_repo) { true }
-        end
-
-        context 'when the project does not have pages deployed' do
-          it 'does nothing with the pages directory' do
-            allow(project).to receive(:pages_deployed?).and_return(false)
-
-            expect(PagesTransferWorker).not_to receive(:perform_async)
-
-            service_execute
-          end
-        end
-      end
-
       context 'attachments' do
         before do
           expect(project_storage).to receive(:rename_repo) { true }
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index ff271d804f3..ecf9f92d74f 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -715,20 +715,6 @@ RSpec.describe Projects::TransferService do
     end
   end
 
-  context 'moving pages' do
-    let_it_be(:project) { create(:project, namespace: user.namespace) }
-
-    before do
-      group.add_owner(user)
-    end
-
-    it 'does not schedule a job when no pages are deployed' do
-      expect(PagesTransferWorker).not_to receive(:perform_async)
-
-      execute_transfer
-    end
-  end
-
   context 'handling issue contacts' do
     let_it_be(:root_group) { create(:group) }