diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-08-18 16:38:42 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-08-18 16:41:16 -0500 |
commit | 717366d28da11acc6dbe60301bf7e2394400b3c1 (patch) | |
tree | ba3a95c9bf1627519c00dab30562d5cd4f646857 /Gemfile | |
parent | d97c83096a70ed102f993d4c484aff9c786ca831 (diff) | |
parent | 2703330a19e813351e9c33241a59d6b7f54741df (diff) | |
download | gitlab-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')
-rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -209,7 +209,8 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' -# Parse duration +# Parse time & duration +gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' |