Merge pull request #17258 from tumido/update_deps_for_google

Update dependencies to match new fog-google (cherry picked from commit 437ea65) https://bugzilla.redhat.com/show_bug.cgi?id=1585821
ManageIQ · Jun 4, 2018 · 184568b · 184568b
1 parent f59e11c
commit 184568b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -44,7 +44,7 @@ gem "linux_admin",                    "~>1.2.1",       :require => false
 gem "manageiq-api-client",            "~>0.3.0",       :require => false
 gem "manageiq-messaging",                              :require => false, :git => "https://github.com/ManageIQ/manageiq-messaging", :branch => "master"
 gem "memoist",                        "~>0.15.0",      :require => false
-gem "mime-types",                     "~>2.6.1",       :path => "mime-types-redirector"
+gem "mime-types",                     "~>3.0",         :path => "mime-types-redirector"
 gem "more_core_extensions",           "~>3.5"
 gem "nakayoshi_fork",                 "~>0.0.3"  # provides a more CoW friendly fork (GC a few times before fork)
 gem "net-ldap",                       "~>0.16.1",      :require => false

diff --git a/mime-types-redirector/mime-types.gemspec b/mime-types-redirector/mime-types.gemspec
@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mime-types"
-  s.version = "2.6.1"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to?(:required_rubygems_version=)
   s.require_paths = ["lib"]