Automatic merge of gitlab-org/gitlab master
Showing
... | ... | @@ -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.4' | ||
gem 'ruby-magic-static', '~> 0.3.5' | ||
# Fake version of the gem to trick bundler | ||
gem 'mimemagic', '0.3.7', path: 'vendor/shims/mimemagic', require: false | ||
... | ... |
This diff is collapsed.
Please register or sign in to comment