diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-23 00:06:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-23 00:06:06 +0000 |
commit | 5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9 (patch) | |
tree | 1e786999c5965d0e7a4f37b75ce1d91fe6363b4d /Gemfile | |
parent | 69a23cbee136eda0ab37874399421e6865cfc76b (diff) | |
download | gitlab-ce-5cb94fc486b25f14d160a7a584dd9a9f23d1ccc9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |