summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-23 00:06:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-23 00:06:06 +0000
commit5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9 (patch)
tree1e786999c5965d0e7a4f37b75ce1d91fe6363b4d /Gemfile
parent69a23cbee136eda0ab37874399421e6865cfc76b (diff)
downloadgitlab-ce-5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f580c197200..4b5293cada0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -264,7 +264,7 @@ gem 'licensee', '~> 8.9'
gem 'ace-rails-ap', '~> 4.1.0'
# Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.7.7'
+gem 'charlock_holmes', '~> 0.7.5'
# Detect mime content type from content
gem 'mimemagic', '~> 0.3.2'