diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-30 14:12:42 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-30 14:12:42 +0300 |
| commit | 174bea2d05f15bf8e965207bde179c9f27f0dd9b (patch) | |
| tree | 565cece7b5b7cbe85d1db6e9442a7831709adfce /Gemfile.lock | |
| parent | d2b47c76bbc3704f2875c99c857d50e986f2315e (diff) | |
| parent | a951b96be2862ce660dc715a364f574c2f5f72e1 (diff) | |
Merge branch 'zj-update-charlock_holmes' into 'master'
Update charlock_holmes to 0.76
See merge request gitlab-org/gitlab-ce!18103
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb510f6b539..5545552f352 100644 --- 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) |