summaryrefslogtreecommitdiffstats
path: root/lib/redmine
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2023-01-16 01:23:36 +0000
committerGo MAEDA <maeda@farend.jp>2023-01-16 01:23:36 +0000
commit91705e083beeece533afcad8b7285f6698c2a6da (patch)
treeb50243551846b55f68c08a15a636164e5c9aec11 /lib/redmine
parent33088ed3c20bfa8c1d45fbdc9f17b0e2ea69a578 (diff)
downloadredmine-91705e083beeece533afcad8b7285f6698c2a6da.tar.gz
redmine-91705e083beeece533afcad8b7285f6698c2a6da.zip
Support for WebP images (#38168).
* Inline image * Thumbnail * Inserting markup for an image uploaded by drag and drop Patch by Go MAEDA. git-svn-id: https://svn.redmine.org/redmine/trunk@22045 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
-rw-r--r--lib/redmine/mime_type.rb1
-rw-r--r--lib/redmine/thumbnail.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index 65d15aa4b..679c9aa8d 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -44,6 +44,7 @@ module Redmine
'image/jpeg' => 'jpg,jpeg,jpe',
'image/png' => 'png',
'image/tiff' => 'tiff,tif',
+ 'image/webp' => 'webp',
'image/x-ms-bmp' => 'bmp',
'application/javascript' => 'js',
'application/pdf' => 'pdf',
diff --git a/lib/redmine/thumbnail.rb b/lib/redmine/thumbnail.rb
index 0b1333d1a..a777ed9e8 100644
--- a/lib/redmine/thumbnail.rb
+++ b/lib/redmine/thumbnail.rb
@@ -29,7 +29,7 @@ module Redmine
('gswin64c' if Redmine::Platform.mswin?) ||
'gs'
).freeze
- ALLOWED_TYPES = %w(image/bmp image/gif image/jpeg image/png application/pdf)
+ ALLOWED_TYPES = %w(image/bmp image/gif image/jpeg image/png image/webp application/pdf)
# Generates a thumbnail for the source image to target
def self.generate(source, target, size, is_pdf = false)