Commit d78f6526 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'jv-remove-pages-config-update-on-delete' into 'master'

Remove unnecessary call to UpdatePagesConfigurationService

See merge request gitlab-org/gitlab!37946
parents 3657cb4e 7eb90b72
...@@ -1801,7 +1801,6 @@ class Project < ApplicationRecord ...@@ -1801,7 +1801,6 @@ class Project < ApplicationRecord
return unless namespace return unless namespace
mark_pages_as_not_deployed unless destroyed? mark_pages_as_not_deployed unless destroyed?
::Projects::UpdatePagesConfigurationService.new(self).execute
# 1. We rename pages to temporary directory # 1. We rename pages to temporary directory
# 2. We wait 5 minutes, due to NFS caching # 2. We wait 5 minutes, due to NFS caching
......
...@@ -4125,7 +4125,6 @@ RSpec.describe Project do ...@@ -4125,7 +4125,6 @@ RSpec.describe Project do
end end
it 'removes the pages directory and marks the project as not having pages deployed' do it 'removes the pages directory and marks the project as not having pages deployed' do
expect_any_instance_of(Projects::UpdatePagesConfigurationService).to receive(:execute)
expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project).and_return(true) expect_any_instance_of(Gitlab::PagesTransfer).to receive(:rename_project).and_return(true)
expect(PagesWorker).to receive(:perform_in).with(5.minutes, :remove, namespace.full_path, anything) expect(PagesWorker).to receive(:perform_in).with(5.minutes, :remove, namespace.full_path, anything)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment