diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 00:43:13 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 00:44:11 +0300 |
| commit | e0687e8de3f10ce44fe58ad0b39a417410fbf6e5 (patch) | |
| tree | acb8baf386de7cc7deebcb88c432858b69b6e953 | |
| parent | 5e157dc9c3c73b47caf32ef85029ffdc7c82c6db (diff) | |
Upgrade Nokogiri to fix a disclosed vulnerability in libxml2
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Changelog.md b/Changelog.md index 6ff634234..3009b368e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ * Fix the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698) * Properly build the #newhere message for people who got invited [#7702](https://github.com/diaspora/diaspora/pull/7702) * Fix the admin report view for posts without text [#7706](https://github.com/diaspora/diaspora/pull/7706) +* Upgrade Nokogiri to fix [a disclosed vulnerability in libxml2](https://github.com/sparklemotion/nokogiri/issues/1714) ## Features * Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685) @@ -137,7 +137,7 @@ gem "leaflet-rails", "1.2.0" # Parsing -gem "nokogiri", "1.8.1" +gem "nokogiri", "1.8.2" gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5e8481ab8..054f1b156 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,7 +389,7 @@ GEM naught (1.1.0) nenv (0.3.0) nio4r (2.1.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) notiffany (0.1.1) nenv (~> 0.1) @@ -820,7 +820,7 @@ DEPENDENCIES minitest mobile-fu (= 1.4.0) mysql2 (= 0.4.9) - nokogiri (= 1.8.1) + nokogiri (= 1.8.2) omniauth (= 1.6.1) omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) |