Automatic merge of gitlab-org/gitlab-ce master

6a20a6f4 · GitLab Bot · 1a62b528 · dca9e212 · 6a20a6f4 · 6a20a6f4
Commit 6a20a6f4 authored Aug 06, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml +5 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,7 +551,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)

--- a/changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml
+++ b/changelogs/unreleased/65671-update-mini_magick-to-4-9-5.yml
+---
+title: Update mini_magick to 4.9.5
+merge_request: 31505
+author: Takuya Noguchi
+type: security