diff options
| author | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
| commit | 2e221bd5b6472d1eecb654b3518af7886d3dadaf (patch) | |
| tree | afb9e3a86ba3a93b6b5f04cdec6070351992fed4 /app/serializers | |
| parent | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (diff) | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
Merge branch 'glitch' into production
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 c8da6e725..c8f6bec7a 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -53,6 +53,7 @@ class InitialStateSerializer < ActiveModel::Serializer store[:is_staff] = object.current_account.user.staff? store[:trends] = Setting.trends && object.current_account.user.setting_trends store[:default_content_type] = object.current_account.user.setting_default_content_type + store[:system_emoji_font] = object.current_account.user.setting_system_emoji_font end store |