bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-25 11:42:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
wuyingren 2020-05-14 16:32:30 +08:00
commit 71cec2d153
922 changed files with 9431 additions and 4194 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/serializers/rest/instance_serializer.rb
View file

@ -4,9 +4,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper
attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
:languages, :registrations, :approval_required,
:max_toot_chars
:version, :urls, :stats, :thumbnail, :max_toot_chars,
:languages, :registrations, :approval_required, :invites_enabled
has_one :contact_account, serializer: REST::AccountSerializer
@ -68,6 +67,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
Setting.registrations_mode == 'approved'
end
def invites_enabled
Setting.min_invite_role == 'user'
end
private
def instance_presenter