Merge remote-tracking branch 'upstream/master'

2017-08-07 22:43:52 +02:00
parent b8791ae79b a3e53bd442
commit 7a1ca8b0df
82 changed files with 419 additions and 260 deletions
--- a/app/models/concerns/account_avatar.rb
+++ b/app/models/concerns/account_avatar.rb
@@ -8,7 +8,7 @@ module AccountAvatar
  class_methods do
    def avatar_styles(file)
      styles = { original: '120x120#' }
-      styles[:static] = { format: 'png' } if file.content_type == 'image/gif'
+      styles[:static] = { animated: false } if file.content_type == 'image/gif'
      styles
    end

--- a/app/models/concerns/account_header.rb
+++ b/app/models/concerns/account_header.rb
@@ -8,7 +8,7 @@ module AccountHeader
  class_methods do
    def header_styles(file)
      styles = { original: '700x335#' }
-      styles[:static] = { format: 'png' } if file.content_type == 'image/gif'
+      styles[:static] = { animated: false } if file.content_type == 'image/gif'
      styles
    end