Merge branch 'zj-update-charlock_holmes' into 'master'

Update charlock_holmes to 0.76 See merge request gitlab-org/gitlab-ce!18103

Merge branch 'zj-update-charlock_holmes' into 'master'
174bea2d · Douwe Maan · d2b47c76 · a951b96b · 174bea2d
Commit 174bea2d authored Mar 30, 2018 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -120,7 +120,7 @@ GEM
      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
    cause (0.1)
-    charlock_holmes (0.7.5)
+    charlock_holmes (0.7.6)
    childprocess (0.7.0)
      ffi (~> 1.0, >= 1.0.11)
    chronic (0.10.2)