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/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@ -86,6 +86,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
      enabled: registrations_enabled?,
      approval_required: Setting.registrations_mode == 'approved',
      message: registrations_enabled? ? nil : registrations_message,
+      url: ENV.fetch('SSO_ACCOUNT_SIGN_UP', nil),
    }
  end