diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-08-13 00:08:57 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-08-13 00:08:57 +0300 |
| commit | a5645e4aeeabf911c1c0c0c324b1f4d67342e3e1 (patch) | |
| tree | 037ac58f3e0c162d6fc306bc556a0469f7450fdf | |
| parent | 187f550dce577f1fb39503976a30a73a58b2b8e1 (diff) | |
| parent | a637a08056ab62c3048574e8a8ac2ec5fe15994b (diff) | |
Merge branch 'sh-update-mime-types' into 'master'
Update mime-types for Ruby 2.7
See merge request gitlab-org/gitaly!2456
| -rw-r--r-- | changelogs/unreleased/sh-update-mime-types.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/sh-update-mime-types.yml b/changelogs/unreleased/sh-update-mime-types.yml new file mode 100644 index 000000000..410da850d --- /dev/null +++ b/changelogs/unreleased/sh-update-mime-types.yml @@ -0,0 +1,5 @@ +--- +title: Update mime-types for Ruby 2.7 +merge_request: 2456 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 2141b042d..52f7acd3c 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -100,9 +100,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2020.0512) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) |