diff options
| author | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
| commit | 1150110d50d9060fc325825c6770e7ef773ebcff (patch) | |
| tree | 816e549592c184ffe6f545e7def2f785517be0c0 /app/models | |
| parent | 205debc43d841afaa1b2ed7dfd05a6d1b6d9d5e0 (diff) | |
| parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/media_attachment.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 056ed816e..b5e65212e 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -87,6 +87,7 @@ class MediaAttachment < ApplicationRecord convert_options: { output: { 'loglevel' => 'fatal', + 'map_metadata' => '-1', 'q:a' => 2, }, }, diff --git a/app/models/user.rb b/app/models/user.rb index 1556f677d..e33610d54 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,7 +108,7 @@ class User < ApplicationRecord delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal, :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, - :advanced_layout, :use_blurhash, :use_pending_items, :trends, + :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, :default_content_type, :system_emoji_font, to: :settings, prefix: :setting, allow_nil: false |