Unverified Commit e0687e8d authored by Benjamin Neff's avatar Benjamin Neff
Browse files

Upgrade Nokogiri to fix a disclosed vulnerability in libxml2

parent 5e157dc9

Changelog.md

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
* Fix the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698)

* 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)

* 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)

* 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

## Features

* Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685)

* Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685)

Gemfile

+1 −1
Original line number Original line Diff line number Diff line
@@ -137,7 +137,7 @@ gem "leaflet-rails", "1.2.0" 




# Parsing

# 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 "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb

gem "redcarpet",         "3.4.0"

gem "redcarpet",         "3.4.0"

gem "ruby-oembed",       "0.12.0"

gem "ruby-oembed",       "0.12.0"

Gemfile.lock

+2 −2
Original line number Original line Diff line number Diff line
@@ -389,7 +389,7 @@ GEM 
    naught (1.1.0)

    naught (1.1.0)

    nenv (0.3.0)

    nenv (0.3.0)

    nio4r (2.1.0)

    nio4r (2.1.0)

    nokogiri (1.8.1)

    nokogiri (1.8.2)

      mini_portile2 (~> 2.3.0)

      mini_portile2 (~> 2.3.0)

    notiffany (0.1.1)

    notiffany (0.1.1)

      nenv (~> 0.1)

      nenv (~> 0.1)
@@ -820,7 +820,7 @@ DEPENDENCIES 
  minitest

  minitest

  mobile-fu (= 1.4.0)

  mobile-fu (= 1.4.0)

  mysql2 (= 0.4.9)

  mysql2 (= 0.4.9)

  nokogiri (= 1.8.1)

  nokogiri (= 1.8.2)

  omniauth (= 1.6.1)

  omniauth (= 1.6.1)

  omniauth-facebook (= 4.0.0)

  omniauth-facebook (= 4.0.0)

  omniauth-tumblr (= 1.2)

  omniauth-tumblr (= 1.2)