Skip to content

Commit 6e55900

Browse files
committed
fix dependency for mime-type gem and rails 4.1
1 parent 6074cde commit 6e55900

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ script: bundle exec rspec spec
22
env:
33
matrix:
44
- RAILS=4.0.13
5-
- RAILS=4.1.5
5+
- RAILS=4.1.15
66
- RAILS=4.2.6
77
rvm:
88
- 1.9.3

Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,9 @@ group :test do
1616
gem 'capybara'
1717
gem 'selenium-webdriver'
1818
gem 'poltergeist'
19-
gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
19+
if RUBY_VERSION >= '2.0'
20+
gem 'mime-types', '~> 3.0'
21+
else
22+
gem 'mime-types', '< 3.0.0'
23+
end
2024
end

0 commit comments

Comments
 (0)