Skip to content

Commit 99a26f4

Browse files
authored
Merge pull request #173 from ivanovaleksey/carrierwave-1.0-support
Add Carrierwave v1.0 support
2 parents d923685 + e566c59 commit 99a26f4

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

Diff for: .travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ gemfile:
1616
- Gemfile
1717
- gemfiles/carrierwave-0.9.gemfile
1818
- gemfiles/carrierwave-0.10.gemfile
19+
- gemfiles/carrierwave-1.0.gemfile
1920
- gemfiles/carrierwave-master.gemfile
2021
- gemfiles/mongoid-3.1.gemfile
2122
- gemfiles/mongoid-4.0.gemfile

Diff for: carrierwave-mongoid.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
2121
s.require_paths = ["lib"]
2222

23-
s.add_dependency "carrierwave", [">= 0.8.0", "< 0.12.0"]
23+
s.add_dependency "carrierwave", ">= 0.8.0"
2424
s.add_dependency "mongoid", [">= 3.0", "< 7.0"]
2525
s.add_dependency "mongoid-grid_fs", [">= 1.3", "< 3.0"]
2626
s.add_dependency "mime-types", "< 3" if RUBY_VERSION < "2.0" # mime-types 3+ doesn't support ruby 1.9

Diff for: gemfiles/carrierwave-1.0.gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "https://rubygems.org"
2+
3+
gem "carrierwave", "~> 1.0"
4+
5+
gemspec path: "../"

0 commit comments

Comments
 (0)