Merge remote-tracking branch 'parent/main' into upstream-20241026

2024-10-26 10:41:00 +09:00 · 2024-10-26 10:41:00 +09:00 · 0c99b8fbb0
commit 0c99b8fbb0
parent d3d528d595 77cd16f4ee
79 changed files with 2403 additions and 2056 deletions
--- a/app/controllers/concerns/auth/captcha_concern.rb
+++ b/app/controllers/concerns/auth/captcha_concern.rb
@ -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?