Commit 4ee871cb authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'update-ruby-magic' into 'master'

Use ruby-magic-static for the time being

See merge request gitlab-org/gitlab!57487
parents a0ccf05c c624807f
...@@ -274,7 +274,7 @@ gem 'licensee', '~> 9.14.1' ...@@ -274,7 +274,7 @@ gem 'licensee', '~> 9.14.1'
gem 'charlock_holmes', '~> 0.7.7' gem 'charlock_holmes', '~> 0.7.7'
# Detect mime content type from content # Detect mime content type from content
gem 'ruby-magic', '~> 0.3' gem 'ruby-magic-static', '~> 0.3.4'
# Fake version of the gem to trick bundler # Fake version of the gem to trick bundler
gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false
......
...@@ -1113,7 +1113,7 @@ GEM ...@@ -1113,7 +1113,7 @@ GEM
i18n i18n
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-magic (0.3.0) ruby-magic-static (0.3.4)
ruby-prof (1.3.1) ruby-prof (1.3.1)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-saml (1.7.2) ruby-saml (1.7.2)
...@@ -1560,7 +1560,7 @@ DEPENDENCIES ...@@ -1560,7 +1560,7 @@ DEPENDENCIES
rspec_junit_formatter rspec_junit_formatter
rspec_profiling (~> 0.0.6) rspec_profiling (~> 0.0.6)
ruby-fogbugz (~> 0.2.1) ruby-fogbugz (~> 0.2.1)
ruby-magic (~> 0.3) ruby-magic-static (~> 0.3.4)
ruby-prof (~> 1.3.0) ruby-prof (~> 1.3.0)
ruby-progressbar (~> 1.10) ruby-progressbar (~> 1.10)
ruby_parser (~> 3.15) ruby_parser (~> 3.15)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment