diff --git a/Gemfile b/Gemfile index a6bb8ffc..566353d0 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem "rmagick", "= 2.12.2" gem "aws" gem "mimetype-fu" gem "formtastic", ">= 1.1.0" -gem "carrierwave", ">= 0.5.0" +gem "carrierwave", "0.5.0.beta2" gem "actionmailer-with-request" gem "heroku" gem "httparty", ">= 0.6.1" diff --git a/Gemfile.lock b/Gemfile.lock index 422c8e8d..d5c538ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,8 +75,8 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (>= 0.0.3) - carrierwave (0.5.0) - activesupport (~> 3.0.0) + carrierwave (0.5.0.beta2) + activesupport (>= 3.0.0.beta4) cgi_multipart_eof_fix (2.5.0) columnize (0.3.1) configuration (1.1.0) @@ -222,7 +222,7 @@ DEPENDENCIES aws bson_ext (>= 1.0.8) capybara - carrierwave (>= 0.5.0) + carrierwave (= 0.5.0.beta2) cgi_multipart_eof_fix cucumber (= 0.8.5) cucumber-rails diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec index c37ea317..bfbee25f 100644 --- a/locomotive_cms.gemspec +++ b/locomotive_cms.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.add_dependency "aws" s.add_dependency "mimetype-fu" s.add_dependency "formtastic", ">= 1.1.0" - s.add_dependency "carrierwave", ">= 0.5.0" + s.add_dependency "carrierwave", "0.5.0.beta2" s.add_dependency "actionmailer-with-request" s.add_dependency "heroku" s.add_dependency "httparty", ">= 0.6.1"