diff options
| -rw-r--r-- | app/models/application_setting.rb | 10 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index d1e1b45ab43..bf463a3b6bb 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -203,6 +203,10 @@ class ApplicationSetting < ActiveRecord::Base ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url) end + def sidekiq_throttling_column_exists? + ActiveRecord::Base.connection.column_exists?(:application_settings, :sidekiq_throttling_enabled) + end + def domain_whitelist_raw self.domain_whitelist.join("\n") unless self.domain_whitelist.nil? end @@ -256,6 +260,12 @@ class ApplicationSetting < ActiveRecord::Base ensure_health_check_access_token! end + def sidekiq_throttling_enabled? + return false unless sidekiq_throttling_column_exists? + + sidekiq_throttling_enabled + end + private def check_repository_storages diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 3a651ef318a..c6bb8f9c8ed 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -24,7 +24,7 @@ module Gitlab end def sidekiq_throttling_enabled? - current_application_settings.sidekiq_throttling_enabled + current_application_settings.sidekiq_throttling_enabled? end def fake_application_settings |