diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
| commit | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch) | |
| tree | 5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /app/serializers/initial_state_serializer.rb | |
| parent | 136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff) | |
| parent | b8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff) | |
Merge remote-tracking branch 'origin/merge-upstream'
Diffstat (limited to 'app/serializers/initial_state_serializer.rb')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 904daa804..5434f1c56 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -25,13 +25,14 @@ class InitialStateSerializer < ActiveModel::Serializer } if object.current_account - store[:me] = object.current_account.id.to_s - store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal - store[:boost_modal] = object.current_account.user.setting_boost_modal - store[:favourite_modal] = object.current_account.user.setting_favourite_modal - store[:delete_modal] = object.current_account.user.setting_delete_modal - store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif - store[:reduce_motion] = object.current_account.user.setting_reduce_motion + store[:me] = object.current_account.id.to_s + store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal + store[:boost_modal] = object.current_account.user.setting_boost_modal + store[:favourite_modal] = object.current_account.user.setting_favourite_modal + store[:delete_modal] = object.current_account.user.setting_delete_modal + store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif + store[:display_sensitive_media] = object.current_account.user.setting_display_sensitive_media + store[:reduce_motion] = object.current_account.user.setting_reduce_motion end store |