diff --git a/Gemfile.base b/Gemfile.base index c567b71bb0..d91a072aea 100644 --- a/Gemfile.base +++ b/Gemfile.base @@ -91,7 +91,8 @@ group :development, :test do end end -gem 'nokogiri', '>= 1.6.8' +gem 'mimemagic', '~> 0.3.10' +gem 'nokogiri', '~> 1.10.10' gem 'dalli', '~> 2.7' gem 'secure_headers', '~> 6.3.0' gem 'faraday', '~> 0.15.3' diff --git a/Gemfile.lock b/Gemfile.lock index 038e987ef0..a3d1c2bdc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,9 @@ GEM method_source (1.0.0) middleware (0.1.0) mime-types (2.99.3) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.10.3) @@ -892,12 +894,13 @@ DEPENDENCIES mechanize message_bus (~> 2.0.2) message_bus_client! + mimemagic (~> 0.3.10) minitest (= 5.10.3) minitest-reporters minitest-stub-const mocha (~> 1.1.0) mysql2 (~> 0.5.3) - nokogiri (>= 1.6.8) + nokogiri (~> 1.10.10) non-stupid-digest-assets (~> 1.0) oauth2 (~> 1.4) open_id_authentication diff --git a/Gemfile.prod.lock b/Gemfile.prod.lock index 471f9be480..0c9876e21d 100644 --- a/Gemfile.prod.lock +++ b/Gemfile.prod.lock @@ -416,7 +416,9 @@ GEM method_source (1.0.0) middleware (0.1.0) mime-types (2.99.3) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.10.3) @@ -893,13 +895,14 @@ DEPENDENCIES mechanize message_bus (~> 2.0.2) message_bus_client! + mimemagic (~> 0.3.10) minitest (= 5.10.3) minitest-reporters minitest-stub-const mocha (~> 1.1.0) mysql2 (~> 0.5.3) newrelic_rpm (~> 5.6) - nokogiri (>= 1.6.8) + nokogiri (~> 1.10.10) non-stupid-digest-assets (~> 1.0) oauth2 (~> 1.4) open_id_authentication diff --git a/doc/licenses/licenses.xml b/doc/licenses/licenses.xml index 77e6e4e594..1f44062af4 100644 --- a/doc/licenses/licenses.xml +++ b/doc/licenses/licenses.xml @@ -1599,7 +1599,7 @@ mimemagic - 0.3.2 + 0.3.10 MIT