summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-04-30 12:45:07 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:24 +0200
commit197932a2225904898778e7edadc0e447b91cc2ef (patch)
treef4251e9c049bf45e9c3cd6f956899ad032c05f11 /app/uploaders
parent1e9c33acd1129557124e330df2f178fb097d67e5 (diff)
downloadgitlab-ce-197932a2225904898778e7edadc0e447b91cc2ef.tar.gz
allow only png, ico for favicon uploads
the related omnibus graphicsmagick package only supports those formats. see https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1975
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/favicon_uploader.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/favicon_uploader.rb b/app/uploaders/favicon_uploader.rb
index d7be77477b2..aa4c78da7a6 100644
--- a/app/uploaders/favicon_uploader.rb
+++ b/app/uploaders/favicon_uploader.rb
@@ -11,7 +11,7 @@ class FaviconUploader < AttachmentUploader
end
def extension_whitelist
- UploaderHelper::IMAGE_EXT
+ %w[png ico]
end
private