monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Mastodon relying on ImageMagick even with `MASTODON_USE_LIBVIPS` (#30590)

This commit is contained in:
Claire 2024-06-07 11:27:59 +02:00 committed by GitHub
parent 8041fa174b
commit 1408733386
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/custom_emoji.rb
View File

@ -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
spec/models/custom_emoji_spec.rb
View File

@ -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) }