Merge branch 'mimemagic_shim' into 'master'
Create a fake mimemagic gem in the vendors folder [RUN ALL RSPEC] [RUN AS-IF-FOSS] See merge request gitlab-org/gitlab!57443
Showing
... | @@ -276,6 +276,9 @@ gem 'charlock_holmes', '~> 0.7.7' | ... | @@ -276,6 +276,9 @@ 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', '~> 0.3' | ||
# Fake version of the gem to trick bundler | |||
gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false | |||
# Faster blank | # Faster blank | ||
gem 'fast_blank' | gem 'fast_blank' | ||
... | ... |
Please register or sign in to comment