Commit 49d4379a authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'sh-use-upstream-ruby-magic' into 'master'

Use upstream ruby-magic project

See merge request gitlab-org/gitlab!57463
parents d18efebe 6e68aece
...@@ -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-static' gem 'ruby-magic', '~> 0.3'
# Faster blank # Faster blank
gem 'fast_blank' gem 'fast_blank'
......
...@@ -1109,7 +1109,7 @@ GEM ...@@ -1109,7 +1109,7 @@ GEM
i18n i18n
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
ruby-magic-static (0.3.1) ruby-magic (0.3.0)
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)
...@@ -1555,7 +1555,7 @@ DEPENDENCIES ...@@ -1555,7 +1555,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-static ruby-magic (~> 0.3)
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