diff --git a/Gemfile b/Gemfile index 62d3b762f..f119ccead 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' # file uploading -gem 'carrierwave', '0.7.1' +gem 'carrierwave', '0.8.0' gem 'fog', '1.9.0' gem 'mini_magick', '3.4' diff --git a/Gemfile.lock b/Gemfile.lock index 42d8e5c64..5e7388ef5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - carrierwave (0.7.1) + carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) childprocess (0.3.7) @@ -415,7 +415,7 @@ DEPENDENCIES capistrano (= 2.12.0) capistrano_colors (= 0.5.5) capybara (= 1.1.3) - carrierwave (= 0.7.1) + carrierwave (= 0.8.0) client_side_validations (= 3.2.1) configurate (= 0.0.2) cucumber-rails (= 1.3.0)