diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-10-03 11:10:12 +0200 |
commit | a84aedb7a7f050cbf5293351723f55a904992b3a (patch) | |
tree | 769d397390665bcddf9b44fc1ad4418b2757c5f1 /app/serializers/nodeinfo/serializer.rb | |
parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
parent | bae268b2f6501ccb0ceeb8dd36180698839c4d3c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
Diffstat (limited to 'app/serializers/nodeinfo/serializer.rb')
-rw-r--r-- | app/serializers/nodeinfo/serializer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/nodeinfo/serializer.rb b/app/serializers/nodeinfo/serializer.rb index 1a7d7a911..7ff8aabec 100644 --- a/app/serializers/nodeinfo/serializer.rb +++ b/app/serializers/nodeinfo/serializer.rb @@ -3,7 +3,7 @@ class NodeInfo::Serializer < ActiveModel::Serializer include RoutingHelper - attributes :version, :software, :protocols, :usage + attributes :version, :software, :protocols, :usage, :open_registrations def version '2.0' @@ -33,6 +33,10 @@ class NodeInfo::Serializer < ActiveModel::Serializer } end + def open_registrations + Setting.registrations_mode != 'none' && !Rails.configuration.x.single_user_mode + end + private def instance_presenter |