From 9f6b4c56ad6c1d12c9cc54970cf7d40d8babf7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 7 Sep 2015 11:02:42 +0200
Subject: [PATCH] bump twitter

---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6d8aa4a76..de37ec324 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,7 @@ gem "omniauth",           "1.2.2"
 gem "omniauth-facebook",  "2.0.1"
 gem "omniauth-tumblr",    "1.1"
 gem "omniauth-twitter",   "1.2.1"
-gem "twitter",            "5.14.0"
+gem "twitter",            "5.15.0"
 gem "omniauth-wordpress", "0.2.2"
 
 # Serializers
diff --git a/Gemfile.lock b/Gemfile.lock
index a00c83c91..cc66a6be5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -176,7 +176,7 @@ GEM
       hiredis (~> 0.5.0)
     entypo-rails (2.2.3)
       railties (>= 3.1, <= 5)
-    equalizer (0.0.11)
+    equalizer (0.0.10)
     erubis (2.7.0)
     ethon (0.7.4)
       ffi (>= 1.3.0)
@@ -359,10 +359,14 @@ GEM
     hike (1.2.3)
     hiredis (0.5.2)
     hitimes (1.2.2)
-    http (0.6.4)
+    http (0.9.6)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
+    http-form_data (1.0.1)
     http_accept_language (2.0.5)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
@@ -707,12 +711,12 @@ GEM
     timecop (0.8.0)
     timers (4.0.1)
       hitimes
-    twitter (5.14.0)
+    twitter (5.15.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
-      equalizer (~> 0.0.9)
+      equalizer (= 0.0.10)
       faraday (~> 0.9.0)
-      http (~> 0.6.0)
+      http (>= 0.4, < 0.10)
       http_parser.rb (~> 0.6.0)
       json (~> 1.8)
       memoizable (~> 0.4.0)
@@ -869,7 +873,7 @@ DEPENDENCIES
   spring-commands-rspec (= 1.0.4)
   test_after_commit (= 0.4.1)
   timecop (= 0.8.0)
-  twitter (= 5.14.0)
+  twitter (= 5.15.0)
   twitter-text (= 1.12.0)
   typhoeus (= 0.7.2)
   uglifier (= 2.7.2)