diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-28 16:25:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 16:25:55 +0100 |
| commit | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (patch) | |
| tree | 1c49c58aa3c45a4ccc5c513ed0539facaf6cc137 /app/serializers | |
| parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
| parent | 046cd05a839896ffa3aedb3270c7487f0766bdf9 (diff) | |
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rss/account_serializer.rb | 2 | ||||
| -rw-r--r-- | app/serializers/rss/tag_serializer.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index d40fe3380..e5e88c200 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -55,11 +55,13 @@ class InitialStateSerializer < ActiveModel::Serializer 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 + store[:crop_images] = object.current_account.user.setting_crop_images 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[:crop_images] = Setting.crop_images end store diff --git a/app/serializers/rss/account_serializer.rb b/app/serializers/rss/account_serializer.rb index e39b2b372..ee972ff96 100644 --- a/app/serializers/rss/account_serializer.rb +++ b/app/serializers/rss/account_serializer.rb @@ -2,7 +2,7 @@ class RSS::AccountSerializer include ActionView::Helpers::NumberHelper - include StatusesHelper + include AccountsHelper include RoutingHelper def render(account, statuses, tag) diff --git a/app/serializers/rss/tag_serializer.rb b/app/serializers/rss/tag_serializer.rb index 6737fb2c9..ea26189a2 100644 --- a/app/serializers/rss/tag_serializer.rb +++ b/app/serializers/rss/tag_serializer.rb @@ -3,7 +3,6 @@ class RSS::TagSerializer include ActionView::Helpers::NumberHelper include ActionView::Helpers::SanitizeHelper - include StatusesHelper include RoutingHelper def render(tag, statuses) |