diff --git a/Changelog.md b/Changelog.md index 2c5a37950..886b5cc40 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ # 0.7.13.0 +## Security +* Fixes [USN-4274-1](https://usn.ubuntu.com/4274-1/), a potential Denial-of-Service vulnerability in Nokogiri. [#8108](https://github.com/diaspora/diaspora/pull/8108) + ## Refactor * Set better example values for unicorn stdout/stderr log settings [#8058](https://github.com/diaspora/diaspora/pull/8058) * Replace dependency on rails-assets.org with custom gems cache at gems.diasporafoundation.org [#8087](https://github.com/diaspora/diaspora/pull/8087) diff --git a/Gemfile b/Gemfile index b10f65b3a..4416b5feb 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ gem "activerecord-import", "1.0.2" gem "carrierwave", "1.3.1" gem "fog-aws", "3.5.1" -gem "mini_magick", "4.9.3" +gem "mini_magick", "4.10.1" # GUID generation gem "uuid", "2.3.9" diff --git a/Gemfile.lock b/Gemfile.lock index 045f2bbb0..dcfa93edc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,7 +400,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) mimemagic (0.3.4) - mini_magick (4.9.3) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -842,7 +842,7 @@ DEPENDENCIES logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) - mini_magick (= 4.9.3) + mini_magick (= 4.10.1) minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2)