Merge pull request #420 from rollbar/fix-mime-types-dependency

Use mime-types < 3.0 for RUBY < 2.0
rollbar · Apr 8, 2016 · fd3ac50 · fd3ac50
2 parents 8c8a0a1 + f032956
commit fd3ac50
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source 'https://rubygems.org'
 
@@ -36,4 +36,8 @@ gem 'database_cleaner', '~> 1.0.0'
 gem 'genspec', '>= 0.2.8'
 gem 'girl_friday', '>= 0.11.1'
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => '../'
diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
@@ -34,4 +34,8 @@ gem 'database_cleaner'
 gem 'girl_friday'
 gem 'generator_spec'
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => "../"
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
@@ -36,4 +36,8 @@ gem 'database_cleaner', '~> 1.0.0'
 gem 'girl_friday', '>= 0.11.1'
 gem 'generator_spec'
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => "../"
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
@@ -36,4 +36,8 @@ gem 'database_cleaner', '~> 1.0.0'
 gem 'girl_friday', '>= 0.11.1'
 gem 'generator_spec'
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => "../"
diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
@@ -34,4 +34,8 @@ gem 'database_cleaner', '~> 1.0.0'
 gem 'girl_friday', '>= 0.11.1'
 gem 'generator_spec'
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => "../"
diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
@@ -1,4 +1,4 @@
-# This file was generated by Appraisal
+require 'rubygems/version'
 
 source "https://rubygems.org"
 
@@ -34,4 +34,8 @@ gem 'girl_friday', '>= 0.11.1'
 gem 'generator_spec'
 gem 'codeclimate-test-reporter', :group => :test, :require => nil
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0')
+  gem 'mime-types', '< 3.0'
+end
+
 gemspec :path => "../"