diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-09-09 20:11:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 20:11:48 -0400 |
| commit | 3dff74eecf5387b92b862893248710d2efb90eec (patch) | |
| tree | 0d29d8c952a0c62e7de4348a1d63963fd5eca237 /app/serializers/initial_state_serializer.rb | |
| parent | e18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff) | |
| parent | 14e1fb8d36763e5255e7b8e440ecaf02208db004 (diff) | |
Merge pull request #141 from yipdw/sync/upstream
Sync with upstream @ v1.6.0rc3 ohhhhhhhhhhh heck here we go
Diffstat (limited to 'app/serializers/initial_state_serializer.rb')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 0191948b1..32ffcc688 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -19,7 +19,6 @@ class InitialStateSerializer < ActiveModel::Serializer store[:boost_modal] = object.current_account.user.setting_boost_modal store[:delete_modal] = object.current_account.user.setting_delete_modal store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif - store[:system_font_ui] = object.current_account.user.setting_system_font_ui end store @@ -34,6 +33,8 @@ class InitialStateSerializer < ActiveModel::Serializer store[:default_sensitive] = object.current_account.user.setting_default_sensitive end + store[:text] = object.text if object.text + store end |