Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-03 00:07:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-03 00:07:38 +0300
commit9d54184f308893338967b18874dedebf38acf89e (patch)
tree100e32c6d4b34deac52d9e98a083361d89804b50 /app/uploaders/favicon_uploader.rb
parentd5b5f5e6e1474d5526add9033c9754b8e395841f (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders/favicon_uploader.rb')
-rw-r--r--app/uploaders/favicon_uploader.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/favicon_uploader.rb b/app/uploaders/favicon_uploader.rb
index a0b275b56a9..f393fdf0d84 100644
--- a/app/uploaders/favicon_uploader.rb
+++ b/app/uploaders/favicon_uploader.rb
@@ -1,8 +1,12 @@
# frozen_string_literal: true
class FaviconUploader < AttachmentUploader
+ include UploadTypeCheck::Concern
+
EXTENSION_WHITELIST = %w[png ico].freeze
+ check_upload_type extensions: EXTENSION_WHITELIST
+
def extension_whitelist
EXTENSION_WHITELIST
end