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/models | |
| parent | 18c07738a6b0fa3558863dbb1610695ab6f11b74 (diff) | |
| parent | 046cd05a839896ffa3aedb3270c7487f0766bdf9 (diff) | |
Merge pull request #1240 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |