Merge pull request #2061 from halostatue/allow-mime-types-3

Modify the Gemfile for testing with mime-types 3

Appraisals

 appraise "4.2.awsv2.1" do
 appraise "4.2.awsv2.1" do
   gem "rails", "~> 4.2.0"
   gem "rails", "~> 4.2.0"
   gem "aws-sdk", "~> 2.1.0"
   gem "aws-sdk", "~> 2.1.0"
+
+  group :development, :test do
+    gem 'mime-types', '>= 1.16', '< 4'
+  end
 end
 end
 
 
 appraise "4.2.awsv2.0" do
 appraise "4.2.awsv2.0" do
   gem "rails", "~> 4.2.0"
   gem "rails", "~> 4.2.0"
   gem "aws-sdk", "~> 2.0.0"
   gem "aws-sdk", "~> 2.0.0"
+
+  group :development, :test do
+    gem 'mime-types', '>= 1.16', '< 4'
+  end
 end
 end

Gemfile

@@ -9,7 +9,7 @@ gem 'pry'
 # Prevents bundler from taking a long-time to resolve
 # Prevents bundler from taking a long-time to resolve
 group :development, :test do
 group :development, :test do
   gem 'activerecord-import'
   gem 'activerecord-import'
-  gem 'mime-types', '~> 1.16'
+  gem 'mime-types'
   gem 'builder'
   gem 'builder'
   gem 'rubocop', require: false
   gem 'rubocop', require: false
 end
 end

gemfiles/4.2.awsv2.0.gemfile

@@ -9,7 +9,7 @@ gem "aws-sdk", "~> 2.0.0"
 
 
 group :development, :test do
 group :development, :test do
   gem "activerecord-import"
   gem "activerecord-import"
-  gem "mime-types", "~> 1.16"
+  gem "mime-types", ">= 1.16", "< 4"
   gem "builder"
   gem "builder"
   gem "rubocop", :require => false
   gem "rubocop", :require => false
 end
 end

gemfiles/4.2.awsv2.1.gemfile

@@ -9,7 +9,7 @@ gem "aws-sdk", "~> 2.1.0"
 
 
 group :development, :test do
 group :development, :test do
   gem "activerecord-import"
   gem "activerecord-import"
-  gem "mime-types", "~> 1.16"
+  gem "mime-types", ">= 1.16", "< 4"
   gem "builder"
   gem "builder"
   gem "rubocop", :require => false
   gem "rubocop", :require => false
 end
 end