kay/blimpstodon
1
0
Fork 0
mirror of https://git.asonix.dog/ceralor/mastodon.git synced 2025-10-13 05:44:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'asonix/changes' into v3.0.0-branch

Browse source
This commit is contained in:
asonix 2019-10-08 12:23:42 -05:00
commit b5d80a157d
62 changed files with 7120 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/serializers/initial_state_serializer.rb
View file

@ -38,11 +38,13 @@ class InitialStateSerializer < ActiveModel::Serializer
store[:use_pending_items] = object.current_account.user.setting_use_pending_items
store[:is_staff] = object.current_account.user.staff?
store[:trends] = Setting.trends && object.current_account.user.setting_trends
store[:strip_formatting] = object.current_account.user.setting_strip_formatting
else
store[:auto_play_gif] = Setting.auto_play_gif
store[:display_media] = Setting.display_media
store[:reduce_motion] = Setting.reduce_motion
store[:use_blurhash] = Setting.use_blurhash
store[:auto_play_gif] = Setting.auto_play_gif
store[:display_media] = Setting.display_media
store[:reduce_motion] = Setting.reduce_motion
store[:use_blurhash] = Setting.use_blurhash
store[:strip_formatting] = Setting.strip_formatting
end
store