From a852a3b4a5cd22cb9db73294267ef24d84ab9767 Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Wed, 27 Apr 2016 16:03:29 +0200 Subject: [PATCH] Protect us from too large images --- Gemfile | 1 + Gemfile.lock | 7 +++++++ app/uploaders/picture_uploader.rb | 1 + 3 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index 34b113c6..0bf0e035 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,7 @@ gem 'paper_trail' # for upload management gem 'carrierwave' gem 'mini_magick' +gem 'carrierwave-bombshelter' # for internationalizing gem 'rails-i18n', '~> 4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1dc442e2..02c56dec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,10 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) + carrierwave-bombshelter (0.1.1.6) + activesupport (>= 3.2.0) + carrierwave + fastimage celluloid (0.15.2) timers (~> 1.1.0) celluloid-io (0.15.0) @@ -167,6 +171,8 @@ GEM railties (>= 3.0.0) faraday (0.9.0) multipart-post (>= 1.2, < 3) + fastimage (2.0.0) + addressable (~> 2) ffi (1.9.3) font-awesome-rails (4.1.0.0) railties (>= 3.2, < 5.0) @@ -522,6 +528,7 @@ DEPENDENCIES cancancan capybara carrierwave + carrierwave-bombshelter chart-js-rails cloudinary cocoon diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb index d4ad2a60..37e0aeb9 100644 --- a/app/uploaders/picture_uploader.rb +++ b/app/uploaders/picture_uploader.rb @@ -3,6 +3,7 @@ class PictureUploader < CarrierWave::Uploader::Base include CarrierWave::MiniMagick include CarrierWave::Compatibility::Paperclip + include CarrierWave::BombShelter def paperclip_path "system/#{object_class_name}/#{extra_store_dir}/#{id_partition}/:style/:basename.:extension"