From b398fed43b2a5030dd9e0907ef0a3385340e5afe Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Fri, 15 Jun 2018 16:43:48 +0000
Subject: Merge branch 'dm-remove-favicon-main-version' into 'master'

Remove FaviconUploader favicon_main version

See merge request gitlab-org/gitlab-ce!19891
---
 app/uploaders/favicon_uploader.rb | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'app/uploaders/favicon_uploader.rb')

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
-- 
cgit v1.2.1