diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-04-30 12:45:07 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 16:20:24 +0200 |
| commit | 197932a2225904898778e7edadc0e447b91cc2ef (patch) | |
| tree | f4251e9c049bf45e9c3cd6f956899ad032c05f11 | |
| parent | 1e9c33acd1129557124e330df2f178fb097d67e5 (diff) | |
| download | gitlab-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
| -rw-r--r-- | app/uploaders/favicon_uploader.rb | 2 | ||||
| -rw-r--r-- | spec/features/admin/admin_appearance_spec.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb index bd879635d2f..a5e0ac592b9 100644 --- a/spec/features/admin/admin_appearance_spec.rb +++ b/spec/features/admin/admin_appearance_spec.rb @@ -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) |