autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v2.7.0rc1' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2019-01-09 10:47:10 +01:00
parent 237952c10d bc3a6dd597
commit 4207973809
585 changed files with 16065 additions and 8146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/initial_state_serializer.rb
View File

@ -17,6 +17,7 @@ class InitialStateSerializer < ActiveModel::Serializer
version: Mastodon::Version.to_s,
invites_enabled: Setting.min_invite_role == 'user',
mascot: instance_presenter.mascot&.file&.url,
profile_directory: Setting.profile_directory,
}
if object.current_account
@ -28,6 +29,7 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:display_media] = object.current_account.user.setting_display_media
store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
store[:reduce_motion] = object.current_account.user.setting_reduce_motion
store[:is_staff] = object.current_account.user.staff?
end
store