Commit fa229d77 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'sh-update-charlock-holmes' into 'master'

Update charlock_holmes to v0.7.7

See merge request gitlab-org/gitlab!43575
parents e237088e e5aa3761
......@@ -272,7 +272,7 @@ gem 'licensee', '~> 8.9'
gem 'ace-rails-ap', '~> 4.1.0'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'
gem 'charlock_holmes', '~> 0.7.7'
# Detect mime content type from content
gem 'mimemagic', '~> 0.3.2'
......
......@@ -167,7 +167,7 @@ GEM
mime-types (>= 1.16)
cbor (0.5.9.6)
character_set (1.4.0)
charlock_holmes (0.7.6)
charlock_holmes (0.7.7)
childprocess (3.0.0)
chunky_png (1.3.5)
citrus (3.0.2)
......@@ -1270,7 +1270,7 @@ DEPENDENCIES
capybara (~> 3.33.0)
capybara-screenshot (~> 1.0.22)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.5)
charlock_holmes (~> 0.7.7)
commonmarker (~> 0.20)
concurrent-ruby (~> 1.1)
connection_pool (~> 2.0)
......
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