about summary refs log tree commit diff
path: root/app/models/custom_emoji.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-04-23 09:16:38 +0200
committerGitHub <noreply@github.com>2018-04-23 09:16:38 +0200
commit7db7d68136d8c58c6d354e85096137c39d421671 (patch)
tree84255ce131308064e5e0bb7052dc4ac5e34c1718 /app/models/custom_emoji.rb
parent3bf6da1ffcf8208a0608de7bff6e2155c40e2871 (diff)
Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)
Diffstat (limited to 'app/models/custom_emoji.rb')
-rw-r--r--app/models/custom_emoji.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index 1ec21d1a0..2dd3cac61 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -40,6 +40,8 @@ class CustomEmoji < ApplicationRecord
 
   remotable_attachment :image, LIMIT
 
+  include Attachmentable
+
   def local?
     domain.nil?
   end