Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream

2023-05-28 15:01:53 +02:00
parent a0bc0619ca b896b16cb3
commit 6dbd44faea
40 changed files with 227 additions and 216 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