Fix Mastodon relying on ImageMagick even with MASTODON_USE_LIBVIPS
(#30590)
This commit is contained in:
parent
8041fa174b
commit
1408733386
2 changed files with 2 additions and 2 deletions
|
@ -39,7 +39,7 @@ class CustomEmoji < ApplicationRecord
|
||||||
|
|
||||||
has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
|
has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode, inverse_of: false, dependent: nil
|
||||||
|
|
||||||
has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp' } }, validate_media_type: false
|
has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp', file_geometry_parser: FastGeometryParser } }, validate_media_type: false, processors: [:lazy_thumbnail]
|
||||||
|
|
||||||
normalizes :domain, with: ->(domain) { domain.downcase }
|
normalizes :domain, with: ->(domain) { domain.downcase }
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe CustomEmoji do
|
RSpec.describe CustomEmoji, :paperclip_processing do
|
||||||
describe '#search' do
|
describe '#search' do
|
||||||
subject { described_class.search(search_term) }
|
subject { described_class.search(search_term) }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue