Update tinder to ~> 1.10.0rs-update-tinder

2 files changed, 10 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index 26ffb8c4b36..3739df0e7f4 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index fc9244304a3..3cd08cb77ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -182,8 +182,8 @@ GEM
     factory_girl_rails (4.3.0)
       factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    faraday (0.8.10)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
@@ -335,7 +335,7 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (2.1.2)
+    hashie (3.4.2)
     highline (1.6.21)
     hike (1.2.3)
     hipchat (1.5.2)
@@ -396,7 +396,7 @@ GEM
     mousetrap-rails (1.4.6)
     multi_json (1.11.2)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.20)
     nenv (0.2.0)
     nested_form (0.3.2)
@@ -721,13 +721,13 @@ GEM
     timers (4.0.4)
       hitimes
     timfel-krb5-auth (0.8.3)
-    tinder (1.9.4)
+    tinder (1.10.1)
       eventmachine (~> 1.0)
-      faraday (~> 0.8.9)
+      faraday (~> 0.9.0)
       faraday_middleware (~> 0.9)
-      hashie (>= 1.0, < 3)
+      hashie (>= 1.0)
       json (~> 1.8.0)
-      mime-types (~> 1.19)
+      mime-types
       multi_json (~> 1.7)
       twitter-stream (~> 0.1)
     tins (1.6.0)
@@ -927,7 +927,7 @@ DEPENDENCIES
   teaspoon-jasmine (~> 2.2.0)
   test_after_commit (~> 0.2.2)
   thin (~> 1.6.1)
-  tinder (~> 1.9.2)
+  tinder (~> 1.10.0)
   turbolinks (~> 2.5.0)
   uglifier (~> 2.3.2)
   underscore-rails (~> 1.4.4)