diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 21:09:28 +0300 |
| commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
| tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/uploaders/gitlab_uploader.rb | |
| parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/uploaders/gitlab_uploader.rb')
| -rw-r--r-- | app/uploaders/gitlab_uploader.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 7dc211b14e4..654bb15378c 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class GitlabUploader < CarrierWave::Uploader::Base + include ContentTypeWhitelist::Concern + class_attribute :options class << self |