summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2017-08-14 12:51:24 +0000
committerMarin Jankovski <marin@gitlab.com>2017-08-14 12:51:24 +0000
commit5c13c734baf2d71191f4f0487f5ff1eb4e5c7708 (patch)
treed54e2464c351e65e5fcb1e4f3a51ba83f264714a
parent56054c3f9c3c78deddcd5cee7a89336efa225a38 (diff)
downloadgitlab-ce-revert-3c2cff0c.tar.gz
Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"revert-3c2cff0c
This reverts merge request !13523
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ab01a556561..d443209349d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,7 +113,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
cause (0.1)
- charlock_holmes (0.7.4)
+ charlock_holmes (0.7.3)
chronic (0.10.2)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)