Merge commit 'e58c36d308' into kb_migration

2023-05-25 08:46:53 +09:00 · 2023-05-25 08:46:53 +09:00 · d6f8f19e31
commit d6f8f19e31
parent 45588ca5f8 e58c36d308
418 changed files with 2835 additions and 1841 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -52,7 +52,7 @@ module ApplicationHelper
    if closed_registrations? || omniauth_only?
      'https://joinmastodon.org/#getting-started'
    else
-      new_user_registration_path
+      ENV.fetch('SSO_ACCOUNT_SIGN_UP', new_user_registration_path)
    end
  end