diff options
author | Douwe Maan <douwe@gitlab.com> | 2019-08-06 17:08:58 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-08-06 17:08:58 +0000 |
commit | dca9e2124c70f07eb24785f09ba3715e932c7103 (patch) | |
tree | 2e467860ee9e2ba853873e4de1d4c0a88505bb17 | |
parent | 4a6e6cefcd0a984c692700d043795fb9a6b9b269 (diff) | |
parent | 6b7e245902051ad5a5e99dddd127cdf6d981e3f1 (diff) | |
download | gitlab-ce-dca9e2124c70f07eb24785f09ba3715e932c7103.tar.gz |
Merge branch '65671-update-mini_magick-to-4.9.5' into 'master'
Update mini_magick to 4.9.5
Closes #65671
See merge request gitlab-org/gitlab-ce!31505
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 368cbef4577..405814a77d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -522,7 +522,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) mimemagic (0.3.2) - mini_magick (4.8.0) + mini_magick (4.9.5) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) diff --git a/changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml b/changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml new file mode 100644 index 00000000000..a6f8576ae0b --- /dev/null +++ b/changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml @@ -0,0 +1,5 @@ +--- +title: Update mini_magick to 4.9.5 +merge_request: 31505 +author: Takuya Noguchi +type: security |