diff options
author | Nick Thomas <nick@gitlab.com> | 2019-05-20 08:44:20 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-05-20 08:44:20 +0000 |
commit | f14565948f8d7759f6c0e7d6cc77445b2211e8f6 (patch) | |
tree | b0711f76b41f4343a7a98369d780e59ee2a7d849 | |
parent | 5666c8eb0cfc0f9f48bcab59c88e8a6b6bef84ff (diff) | |
parent | 6bec8cbdebdf598285aaf91440a6992a43d26927 (diff) | |
download | gitlab-ce-f14565948f8d7759f6c0e7d6cc77445b2211e8f6.tar.gz |
Merge branch '44696-pages-domain-verification-seems-to-be-struggling-to-scale-to-gitlab-com-levels' into 'master'
Remove remove_disabled_domains feature flag
Closes #44696
See merge request gitlab-org/gitlab-ce!28408
-rw-r--r-- | app/workers/pages_domain_removal_cron_worker.rb | 2 | ||||
-rw-r--r-- | spec/workers/pages_domain_removal_cron_worker_spec.rb | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/app/workers/pages_domain_removal_cron_worker.rb b/app/workers/pages_domain_removal_cron_worker.rb index 3aca123e5ac..79f38e1b89f 100644 --- a/app/workers/pages_domain_removal_cron_worker.rb +++ b/app/workers/pages_domain_removal_cron_worker.rb @@ -5,8 +5,6 @@ class PagesDomainRemovalCronWorker include CronjobQueue def perform - return unless Feature.enabled?(:remove_disabled_domains) - PagesDomain.for_removal.find_each do |domain| domain.destroy! rescue => e diff --git a/spec/workers/pages_domain_removal_cron_worker_spec.rb b/spec/workers/pages_domain_removal_cron_worker_spec.rb index 0e1171e8491..2408ad54189 100644 --- a/spec/workers/pages_domain_removal_cron_worker_spec.rb +++ b/spec/workers/pages_domain_removal_cron_worker_spec.rb @@ -9,25 +9,10 @@ describe PagesDomainRemovalCronWorker do context 'when there is domain which should be removed' do let!(:domain_for_removal) { create(:pages_domain, :should_be_removed) } - before do - stub_feature_flags(remove_disabled_domains: true) - end - it 'removes domain' do expect { worker.perform }.to change { PagesDomain.count }.by(-1) expect(PagesDomain.exists?).to eq(false) end - - context 'when domain removal is disabled' do - before do - stub_feature_flags(remove_disabled_domains: false) - end - - it 'does not remove pages domain' do - expect { worker.perform }.not_to change { PagesDomain.count } - expect(PagesDomain.find_by(domain: domain_for_removal.domain)).to be_present - end - end end context 'where there is a domain which scheduled for removal in the future' do |