erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Merge d0a938d7e4 into a50c8e951f

Browse source
This commit is contained in:
Matt Jankowski 2024-07-31 14:07:10 +00:00 committed by GitHub
commit d8488510be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/auth/captcha_concern.rb
View file

@ -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
app/helpers/admin/settings_helper.rb
View file

@ -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)

2
config/application.rb
View file

@ -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
View file

@ -0,0 +1,3 @@
shared:
secret_key: <%= ENV.fetch('HCAPTCHA_SECRET_KEY', nil) %>
site_key: <%= ENV.fetch('HCAPTCHA_SITE_KEY', nil) %>