diff --git a/Gemfile b/Gemfile index e0731ac06..ed66a2ea0 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,7 @@ gem "activerecord-import", "0.13.0" # File uploading -gem "carrierwave", "0.10.0" +gem "carrierwave", "0.11.2" gem "fog", "1.37.0" gem "mini_magick", "4.4.0" gem "remotipart", "1.2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 39eddedad..8d604908b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,11 +77,12 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.10.0) + carrierwave (0.11.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) + mimemagic (>= 0.3.0) celluloid (0.16.0) timers (~> 4.0.0) celluloid-io (0.16.2) @@ -449,6 +450,7 @@ GEM mime-types (3.0) mime-types-data (~> 3.2015) mime-types-data (3.2016.0221) + mimemagic (0.3.1) mini_magick (4.4.0) mini_portile2 (2.0.0) minitest (5.8.4) @@ -790,7 +792,7 @@ DEPENDENCIES backbone-on-rails (= 1.2.0.0) bootstrap-sass (= 2.3.2.2) capybara (= 2.6.2) - carrierwave (= 0.10.0) + carrierwave (= 0.11.2) compass-rails (= 2.0.5) configurate (= 0.3.1) cucumber-rails (= 1.4.3)