summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-08-18 16:38:42 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-08-18 16:41:16 -0500
commit717366d28da11acc6dbe60301bf7e2394400b3c1 (patch)
treeba3a95c9bf1627519c00dab30562d5cd4f646857 /Gemfile.lock
parentd97c83096a70ed102f993d4c484aff9c786ca831 (diff)
parent2703330a19e813351e9c33241a59d6b7f54741df (diff)
downloadgitlab-ce-717366d28da11acc6dbe60301bf7e2394400b3c1.tar.gz
Merge branch '4273-slash-commands' into 'master'
Support slash commands in issues / MR description & comments See merge request !5021
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ff95fb4ceed..f32d30bccd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,6 +128,7 @@ GEM
mime-types (>= 1.16)
cause (0.1)
charlock_holmes (0.7.3)
+ chronic (0.10.2)
chronic_duration (0.10.6)
numerizer (~> 0.1.1)
chunky_png (1.3.5)
@@ -824,6 +825,7 @@ DEPENDENCIES
capybara-screenshot (~> 1.0.0)
carrierwave (~> 0.10.0)
charlock_holmes (~> 0.7.3)
+ chronic (~> 0.10.2)
chronic_duration (~> 0.10.6)
coffee-rails (~> 4.1.0)
connection_pool (~> 2.0)