From b14a91e8648fd0ea3a8b195b2dfc0a636921af05 Mon Sep 17 00:00:00 2001
From: Roland Jesse <roland@gasbottle-county.eu>
Date: Wed, 9 Jan 2013 22:47:11 +0100
Subject: [PATCH] Get rid of the Twitter gem. We won't do anything with Twitter
 anymore.

---
 Gemfile      |  7 ++-----
 Gemfile.lock | 15 ++++++---------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index ed441e9..e92d0dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,11 +23,8 @@ gem 'cancan', '1.6.5'
 gem 'capistrano', '2.5.21'
 
 # For avatar images: https://github.com/jnicklas/carrierwave
-# gem 'rmagick', '2.9.2'
-# gem 'carrierwave', '0.6.2'
-
-# https://github.com/jnunemaker/twitter
-gem 'twitter', '2.5.0'
+gem 'rmagick', '2.9.2'
+gem 'carrierwave', '0.6.2'
 
 # Specify this directly in order to use version we also have @production site. Otherwise, 'rdoc' pulls newest version in.
 gem 'json', '1.6.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 43abfc4..d263364 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,6 +52,9 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.0.0)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -67,8 +70,6 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.1)
-      multipart-post (~> 1.1)
     fastercsv (1.5.5)
     formtastic (2.2.1)
       actionpack (>= 3.0)
@@ -99,7 +100,6 @@ GEM
       polyamorous (~> 0.5.0)
     mime-types (1.19)
     multi_json (1.5.0)
-    multipart-post (1.1.5)
     mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -138,12 +138,12 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     responders (0.6.5)
+    rmagick (2.9.2)
     sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    simple_oauth (0.1.8)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -154,10 +154,6 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (2.5.0)
-      faraday (~> 0.8)
-      multi_json (~> 1.3)
-      simple_oauth (~> 0.1.6)
     tzinfo (0.3.35)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
@@ -175,12 +171,13 @@ DEPENDENCIES
   bourbon (= 1.4.0)
   cancan (= 1.6.5)
   capistrano (= 2.5.21)
+  carrierwave (= 0.6.2)
   coffee-rails (= 3.2.2)
   devise (= 2.0.4)
   json (= 1.6.5)
   mail
   mysql2 (= 0.3.11)
   rails (= 3.2.11)
+  rmagick (= 2.9.2)
   sass-rails (= 3.2.5)
-  twitter (= 2.5.0)
   uglifier