Merge remote-tracking branch 'bobbyw/patch-1'

# By Bobby Wilson # Via Bobby Wilson * bobbyw/patch-1: bump carrierwave version Conflicts: carrierwave-mongoid.gemspec
carrierwaveuploader · Dec 16, 2012 · e77c770 · e77c770
2 parents 2c7a185 + dd2a4f1
commit e77c770
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/carrierwave-mongoid.gemspec b/carrierwave-mongoid.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "carrierwave", ["~> 0.6"]
+  s.add_dependency "carrierwave", ["~> 0.7.1"]
   s.add_dependency "mongoid", ["~> 3.0.0"]
   s.add_dependency "mongoid-grid_fs", ["~> 1.3.1"]
   s.add_development_dependency "rspec", ["~> 2.6"]