diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-17 11:44:35 +0000 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-18 12:02:33 -0500 |
commit | 9632e0e735a797752ef603e7c56ab787d751a49c (patch) | |
tree | af2c7a967d8165521fe4cf4fd21f8de3b06d1254 | |
parent | 8673cfe4fe10f47cf8b3bc406229bdf2a6145044 (diff) | |
download | gitlab-ce-9632e0e735a797752ef603e7c56ab787d751a49c.tar.gz |
Merge branch '35072-fix-pages-delete' into 'master'
Resolve "Deleting of a GitLab Pages project results in "`PagesWorker.perform_in` cannot be called inside a transaction""
Closes #35072
See merge request !13631
-rw-r--r-- | app/models/project.rb | 5 | ||||
-rw-r--r-- | app/workers/namespaceless_project_destroy_worker.rb | 4 | ||||
-rw-r--r-- | changelogs/unreleased/35072-fix-pages-delete.yml | 5 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 38 |
4 files changed, 47 insertions, 5 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 27c6e0a85ea..9652a2a1c4d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -60,7 +60,7 @@ class Project < ActiveRecord::Base end before_destroy :remove_private_deploy_keys - after_destroy :remove_pages + after_destroy -> { run_after_commit { remove_pages } } # update visibility_level of forks after_update :update_forks_visibility_level @@ -1221,6 +1221,9 @@ class Project < ActiveRecord::Base # TODO: what to do here when not using Legacy Storage? Do we still need to rename and delay removal? def remove_pages + # Projects with a missing namespace cannot have their pages removed + return unless namespace + ::Projects::UpdatePagesConfigurationService.new(self).execute # 1. We rename pages to temporary directory diff --git a/app/workers/namespaceless_project_destroy_worker.rb b/app/workers/namespaceless_project_destroy_worker.rb index bfae0c77700..a9073742ff7 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -24,10 +24,6 @@ class NamespacelessProjectDestroyWorker unlink_fork(project) if project.forked? - # Override Project#remove_pages for this instance so it doesn't do anything - def project.remove_pages - end - project.destroy! end diff --git a/changelogs/unreleased/35072-fix-pages-delete.yml b/changelogs/unreleased/35072-fix-pages-delete.yml new file mode 100644 index 00000000000..21af2bde201 --- /dev/null +++ b/changelogs/unreleased/35072-fix-pages-delete.yml @@ -0,0 +1,5 @@ +--- +title: Fix deleting GitLab Pages files when a project is removed +merge_request: 13631 +author: +type: fixed diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index bd8d57d8af1..fb905f4aa62 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2306,6 +2306,44 @@ describe Project do end end + describe '#remove_pages' do + let(:project) { create(:project) } + let(:namespace) { project.namespace } + let(:pages_path) { project.pages_path } + + around do |example| + FileUtils.mkdir_p(pages_path) + begin + example.run + ensure + FileUtils.rm_rf(pages_path) + end + end + + it 'removes the pages directory' do + expect_any_instance_of(Projects::UpdatePagesConfigurationService).to receive(:execute) + 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) + + project.remove_pages + end + + it 'is a no-op when there is no namespace' do + project.update_column(:namespace_id, nil) + + expect_any_instance_of(Projects::UpdatePagesConfigurationService).not_to receive(:execute) + expect_any_instance_of(Gitlab::PagesTransfer).not_to receive(:rename_project) + + project.remove_pages + end + + it 'is run when the project is destroyed' do + expect(project).to receive(:remove_pages).and_call_original + + project.destroy + end + end + describe '#forks_count' do it 'returns the number of forks' do project = build(:project) |