5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
20 lines
500 B
Ruby
20 lines
500 B
Ruby
module Gitlab
|
|
module Recaptcha
|
|
extend Gitlab::CurrentSettings
|
|
|
|
def self.load_configurations!
|
|
if current_application_settings.recaptcha_enabled
|
|
::Recaptcha.configure do |config|
|
|
config.public_key = current_application_settings.recaptcha_site_key
|
|
config.private_key = current_application_settings.recaptcha_private_key
|
|
end
|
|
|
|
true
|
|
end
|
|
end
|
|
|
|
def self.enabled?
|
|
current_application_settings.recaptcha_enabled
|
|
end
|
|
end
|
|
end
|