Commit 197932a2 authored by Alexis Reigel's avatar Alexis Reigel Committed by Alexis Reigel

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
parent 1e9c33ac
......@@ -11,7 +11,7 @@ class FaviconUploader < AttachmentUploader
end
def extension_whitelist
UploaderHelper::IMAGE_EXT
%w[png ico]
end
private
......
......@@ -93,7 +93,7 @@ feature 'Admin Appearance' do
attach_file(:appearance_favicon, Rails.root.join('spec', 'fixtures', 'sanitized.svg'))
click_button 'Save'
expect(page).to have_content 'Favicon You are not allowed to upload "svg" files, allowed types: png, jpg, jpeg, gif, bmp, tiff, ico'
expect(page).to have_content 'Favicon You are not allowed to upload "svg" files, allowed types: png, ico'
end
def expect_custom_sign_in_appearance(appearance)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment