diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-18 10:40:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-18 10:40:03 +0000 |
| commit | 9ccbc18e1f775f5edbe36b9c1777db2c0122d092 (patch) | |
| tree | 7e037a95c5cb7c6327df12e727dcd6d705cfdf03 /app/uploaders/favicon_uploader.rb | |
| parent | bc7ea2f34fcb0ced6d814fc2b4e8944aa0ae9875 (diff) | |
| parent | 2ab2dda963d95ea7ccf1418f9657cb31df441160 (diff) | |
| download | gitlab-ce-9ccbc18e1f775f5edbe36b9c1777db2c0122d092.tar.gz | |
Merge branch '11-0-stable-prepare-rc13-fix-26810dd7-conflicts' into '11-0-stable-prepare-rc13'11-0-stable-prepare-rc13
Resolve conflicts when cherry picking !19891
See merge request gitlab-org/gitlab-ce!19953
Diffstat (limited to 'app/uploaders/favicon_uploader.rb')
| -rw-r--r-- | app/uploaders/favicon_uploader.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/uploaders/favicon_uploader.rb b/app/uploaders/favicon_uploader.rb index 09afc63a5aa..3639375d474 100644 --- a/app/uploaders/favicon_uploader.rb +++ b/app/uploaders/favicon_uploader.rb @@ -1,17 +1,6 @@ class FaviconUploader < AttachmentUploader EXTENSION_WHITELIST = %w[png ico].freeze - include CarrierWave::MiniMagick - - version :favicon_main do - process resize_to_fill: [32, 32] - process convert: 'png' - - def full_filename(filename) - filename_for_different_format(super(filename), 'png') - end - end - def extension_whitelist EXTENSION_WHITELIST end |