mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream
Conflicts: - `.eslintrc.js`: Upstream moved it to `eslint.config.mjs`. Ported the glitch-soc changes there. - `yarn.lock`: Upstream updated dependencies close to glitch-soc-only dependencies. Ported upstream's changes.
This commit is contained in:
@@ -123,7 +123,14 @@ module Paperclip
|
||||
end
|
||||
|
||||
def needs_convert?
|
||||
needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
|
||||
strip_animations? || needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
|
||||
end
|
||||
|
||||
def strip_animations?
|
||||
# Detecting whether the source image is animated across all our supported
|
||||
# input file formats is not trivial, and converting unconditionally is just
|
||||
# as simple for now
|
||||
options[:style] == :static
|
||||
end
|
||||
|
||||
def needs_different_geometry?
|
||||
|
||||
Reference in New Issue
Block a user