diff --git a/Gemfile b/Gemfile index 6bf9949..e09e5e6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source "https://rubygems.org" gemspec -gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19] gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19] diff --git a/Gemfile.lock b/Gemfile.lock index 7335b09..764d3b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,9 +30,8 @@ GEM launchy (2.4.3-java) addressable (~> 2.3) spoon (~> 0.0.1) - mime-types (2.99.3) mini_magick (4.8.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) mustermann (1.0.1) nokogiri (1.8.1) @@ -82,11 +81,10 @@ DEPENDENCIES capybara-webkit! json (< 2.0) launchy - mime-types (< 3.0) mini_magick rake (< 12.0.0) rspec (~> 3.5) sinatra BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/gemfiles/2.15.gemfile b/gemfiles/2.15.gemfile index 50207ae..f52cc3b 100644 --- a/gemfiles/2.15.gemfile +++ b/gemfiles/2.15.gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" -gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19] gem "json", "< 2.0", platforms: [:ruby_19, :jruby_19] gem "capybara", "~> 2.15.0" gem "addressable", "< 2.5.0", platforms: [:ruby_19, :jruby_19] diff --git a/gemfiles/master.gemfile b/gemfiles/master.gemfile index 12bdbbc..7a2f2c3 100644 --- a/gemfiles/master.gemfile +++ b/gemfiles/master.gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" -gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19] gem "json", "< 2.0", platforms: [:ruby_19, :jruby_19] gem "capybara", github: "jnicklas/capybara"