diff options
author | Rémy Coutable <remy@rymai.me> | 2018-11-12 15:40:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-11-12 15:40:10 +0000 |
commit | 1116de5eeb27748495ead7f837ba0c63131b6df2 (patch) | |
tree | c76006d58397d5b7567384f3da0f33444de48e3e /Gemfile.lock | |
parent | 56834e6bb2ac1e8ef2e448f215217f89f477a7a2 (diff) | |
parent | e1079ee28ff5868d94cb503f27578e39ef82ee32 (diff) | |
download | gitlab-ce-1116de5eeb27748495ead7f837ba0c63131b6df2.tar.gz |
Merge branch 'sh-bump-mime-types' into 'master'
Bump mime-types to 3.2.2
See merge request gitlab-org/gitlab-ce!22957
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8570fabb72f..f8e8607c90e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -451,9 +451,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.0) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mimemagic (0.3.0) mini_magick (4.8.0) mini_mime (1.0.1) |