diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-03 10:26:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-03 10:26:09 +0200 |
| commit | d2f5760ceb12ade0134be5a5fe96e677c5e6c925 (patch) | |
| tree | 64164086531e2fc9a4a4abb355add786ba79f3af /app/models/custom_emoji.rb | |
| parent | c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 (diff) | |
| parent | 7bf37551c8ee55d05a5dbca23db2cae7bb572789 (diff) | |
Merge pull request #1793 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index d7349dc6a..196ae0297 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -32,7 +32,7 @@ class CustomEmoji < ApplicationRecord :(#{SHORTCODE_RE_FRAGMENT}): (?=[^[:alnum:]:]|$)/x - IMAGE_MIME_TYPES = %w(image/png image/gif).freeze + IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze belongs_to :category, class_name: 'CustomEmojiCategory', optional: true has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode |