logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 1b5d26735e46719eba4dac4b79719460d7bbba63
parent: a3e53bd442752f210db2025f2dfc45e7599354c2
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Tue,  8 Aug 2017 08:49:56 +0900

Revert "Set false to animated options for thumbnail processor" (#4550)

* Revert "Adjust tags and accounts page (#4534)"

This reverts commit a3e53bd442752f210db2025f2dfc45e7599354c2.

* Revert "feat: Cache status height to avoid expensive renders (#4439)"

This reverts commit 8eb6d171e690e013eb2881478cfa1fd50b4ba705.

* Revert "Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)"

This reverts commit 594234740788a51fa528152343eb50dc1c6ca093.

* Revert "Update dependencies for Ruby (#4543)"

This reverts commit 22db9472253f6ffcfed254f7a406a58b53e80cfe.

* Revert "[Docker] Add multicore support to "make" and "bundler" (#4544)"

This reverts commit 5d408fd9aa76f9ef3d559a377bccbcece998fbfa.

* Revert "It makes no sense to try using invalid or expired link again (#4521)"

This reverts commit 47579ec58ce984acc9f194f8cb145abd88d0ea19.

* Revert "i18n: Update Polish translation (#4545)"

This reverts commit 3363a05539c0c774fca4651755e6423fe131d205.

* Revert "Set false to animated options for thumbnail processor (#4547)"

This reverts commit 87f10d476cf7a05bc60851c93e3c051eca8c357e.

Diffstat:

Mapp/models/concerns/account_avatar.rb2+-
Mapp/models/concerns/account_header.rb2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 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] = { animated: false } if file.content_type == 'image/gif' + styles[:static] = { format: 'png' } if file.content_type == 'image/gif' styles end diff --git 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] = { animated: false } if file.content_type == 'image/gif' + styles[:static] = { format: 'png' } if file.content_type == 'image/gif' styles end