diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-08-07 22:43:52 +0200 |
| commit | 7a1ca8b0df9d82a1e6ac4943a2d5562f93eab69f (patch) | |
| tree | 36fbf6f3d2019cc345d33fe555569ec750a66957 /app/models | |
| parent | b8791ae79be7a9b7c0e541928b2741e40bbdc8a5 (diff) | |
| parent | a3e53bd442752f210db2025f2dfc45e7599354c2 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/concerns/account_avatar.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/account_header.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb index a6527a85b..b0ec689a7 100644 --- 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 diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb index 4ba9212a2..542e25abe 100644 --- 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 |