diff --git a/Gemfile b/Gemfile index af6fe3c562e..c4b97655b04 100644 --- a/Gemfile +++ b/Gemfile @@ -274,7 +274,7 @@ gem 'licensee', '~> 9.14.1' gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content -gem 'ruby-magic-static', '~> 0.3.5' +gem 'ruby-magic', '~> 0.3.2' # Fake version of the gem to trick bundler gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 258f439053c..fe89e36a0ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1113,7 +1113,7 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-magic-static (0.3.5) + ruby-magic (0.3.2) mini_portile2 (~> 2.5.0) ruby-prof (1.3.1) ruby-progressbar (1.11.0) @@ -1560,7 +1560,7 @@ DEPENDENCIES rspec_junit_formatter rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) - ruby-magic-static (~> 0.3.5) + ruby-magic (~> 0.3.2) ruby-prof (~> 1.3.0) ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) diff --git a/changelogs/unreleased/sh-update-ruby-magic.yml b/changelogs/unreleased/sh-update-ruby-magic.yml new file mode 100644 index 00000000000..7e6c456f90f --- /dev/null +++ b/changelogs/unreleased/sh-update-ruby-magic.yml @@ -0,0 +1,5 @@ +--- +title: Update ruby-magic to v0.3.2 +merge_request: 58537 +author: +type: changed