diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
| commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
| tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/uploaders/avatar_uploader.rb | |
| parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
| download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders/avatar_uploader.rb')
| -rw-r--r-- | app/uploaders/avatar_uploader.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb index e4046e4b7e6..73dafaefb41 100644 --- a/app/uploaders/avatar_uploader.rb +++ b/app/uploaders/avatar_uploader.rb @@ -5,9 +5,8 @@ class AvatarUploader < GitlabUploader include RecordsUploads::Concern include ObjectStorage::Concern prepend ObjectStorage::Extension::RecordsUploads - include UploadTypeCheck::Concern - check_upload_type extensions: AvatarUploader::SAFE_IMAGE_EXT + MIME_WHITELIST = %w[image/png image/jpeg image/gif image/bmp image/tiff image/vnd.microsoft.icon].freeze def exists? model.avatar.file && model.avatar.file.present? @@ -29,6 +28,10 @@ class AvatarUploader < GitlabUploader super || 'avatar' end + def content_type_whitelist + MIME_WHITELIST + end + private def dynamic_segment |