diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2019-07-12 19:53:44 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-12 19:53:44 +0300 |
| commit | 7b5936ebdad8df646cbce7a9c035da62cac7cfce (patch) | |
| tree | a9810f2171b3a19045717ff487ff5b4bedde7561 /app/workers | |
| parent | 66333bc78b200f5cfdd3fc47aa1ed52a0eb4220a (diff) | |
Remove auto ssl feature flags
* remove feature flag for admin settings
* remove feature flag for domain settings
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/pages_domain_ssl_renewal_cron_worker.rb | 4 | ||||
| -rw-r--r-- | app/workers/pages_domain_ssl_renewal_worker.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/pages_domain_ssl_renewal_cron_worker.rb b/app/workers/pages_domain_ssl_renewal_cron_worker.rb index 40c34d29970..e5dde07a648 100644 --- a/app/workers/pages_domain_ssl_renewal_cron_worker.rb +++ b/app/workers/pages_domain_ssl_renewal_cron_worker.rb @@ -5,9 +5,9 @@ class PagesDomainSslRenewalCronWorker include CronjobQueue def perform - PagesDomain.need_auto_ssl_renewal.find_each do |domain| - next unless ::Gitlab::LetsEncrypt.enabled?(domain) + return unless ::Gitlab::LetsEncrypt.enabled? + PagesDomain.need_auto_ssl_renewal.find_each do |domain| PagesDomainSslRenewalWorker.perform_async(domain.id) end end diff --git a/app/workers/pages_domain_ssl_renewal_worker.rb b/app/workers/pages_domain_ssl_renewal_worker.rb index b32458ca777..87fd8059946 100644 --- a/app/workers/pages_domain_ssl_renewal_worker.rb +++ b/app/workers/pages_domain_ssl_renewal_worker.rb @@ -6,7 +6,7 @@ class PagesDomainSslRenewalWorker def perform(domain_id) domain = PagesDomain.find_by_id(domain_id) return unless domain&.enabled? - return unless ::Gitlab::LetsEncrypt.enabled?(domain) + return unless ::Gitlab::LetsEncrypt.enabled? ::PagesDomains::ObtainLetsEncryptCertificateService.new(domain).execute end |