mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Move hcaptcha service config to config_for
yml
This commit is contained in:
parent
b42661ba95
commit
1013a2407f
4 changed files with 7 additions and 2 deletions
|
@ -10,7 +10,7 @@ module Auth::CaptchaConcern
|
|||
end
|
||||
|
||||
def captcha_available?
|
||||
ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present?
|
||||
Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present?
|
||||
end
|
||||
|
||||
def captcha_enabled?
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
module Admin::SettingsHelper
|
||||
def captcha_available?
|
||||
ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present?
|
||||
Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present?
|
||||
end
|
||||
|
||||
def login_activity_title(activity)
|
||||
|
|
|
@ -112,6 +112,8 @@ module Mastodon
|
|||
end
|
||||
end
|
||||
|
||||
config.x.captcha = config_for(:captcha)
|
||||
|
||||
config.to_prepare do
|
||||
Doorkeeper::AuthorizationsController.layout 'modal'
|
||||
Doorkeeper::AuthorizedApplicationsController.layout 'admin'
|
||||
|
|
3
config/captcha.yml
Normal file
3
config/captcha.yml
Normal file
|
@ -0,0 +1,3 @@
|
|||
shared:
|
||||
secret_key: <%= ENV.fetch('HCAPTCHA_SECRET_KEY', nil) %>
|
||||
site_key: <%= ENV.fetch('HCAPTCHA_SITE_KEY', nil) %>
|
Loading…
Reference in a new issue