diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
commit | 54a575f1bbba44573ab92dc58a4242f1ee734c5d (patch) | |
tree | 0ee2afe8228f184f7ad28e74d86bff2c5965c4ae /app/uploaders/uploader_helper.rb | |
parent | c63af942e5baf7849a94fa99da8494bcba28e3f8 (diff) | |
parent | 36838a843e99f551c971ec7062327e114c8f0188 (diff) | |
download | gitlab-ce-54a575f1bbba44573ab92dc58a4242f1ee734c5d.tar.gz |
Merge branch '3867-port-to-ce' into 'master'
Port of gitlab-ee!3867 to CE
See merge request gitlab-org/gitlab-ce!16775
Diffstat (limited to 'app/uploaders/uploader_helper.rb')
-rw-r--r-- | app/uploaders/uploader_helper.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/uploaders/uploader_helper.rb b/app/uploaders/uploader_helper.rb index 7635c20ab3a..fd446d31092 100644 --- a/app/uploaders/uploader_helper.rb +++ b/app/uploaders/uploader_helper.rb @@ -32,14 +32,7 @@ module UploaderHelper def extension_match?(extensions) return false unless file - extension = - if file.respond_to?(:extension) - file.extension - else - # Not all CarrierWave storages respond to :extension - File.extname(file.path).delete('.') - end - + extension = file.try(:extension) || File.extname(file.path).delete('.') extensions.include?(extension.downcase) end end |