summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-08 09:26:44 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-08 09:26:44 +0000
commitcb00c15532347b41a7827038b234147d80c8b7fe (patch)
treeb4fd60f5e89e84c494efd138bdc48aad9d5940f1 /Gemfile
parent2272e1d4194890e7889c5e3a65be4982ac55385c (diff)
parenta40cd65d3bd4f284e16c7e8b02b6157d4a882811 (diff)
downloadgitlab-ce-cb00c15532347b41a7827038b234147d80c8b7fe.tar.gz
Merge branch 'rs-update-tinder' into 'master'
Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 416742af69b..b26f2b2b490 100644
--- a/Gemfile
+++ b/Gemfile
@@ -151,7 +151,7 @@ gem 'version_sorter', '~> 2.0.0'
gem "redis-rails", '~> 4.0.0'
# Campfire integration
-gem 'tinder', '~> 1.9.2'
+gem 'tinder', '~> 1.10.0'
# HipChat integration
gem 'hipchat', '~> 1.5.0'