diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-27 21:26:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 21:26:03 +0200 |
| commit | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (patch) | |
| tree | 4ee42aa7195fd98de901dd73947e4eda2f195015 /app/serializers | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 6d60701bfaa3a4b2bc168ea413c8f0c8e1545526 (diff) | |
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index d74e56ebc..efed199f3 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -46,6 +46,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[:advanced_layout] = object.current_account.user.setting_advanced_layout store[:is_staff] = object.current_account.user.staff? store[:default_content_type] = object.current_account.user.setting_default_content_type end |