From 75c4666421ce8b165150d101431d34ae99c1663d Mon Sep 17 00:00:00 2001
From: James Gifford <james@jamesrgifford.com>
Date: Sun, 27 Jan 2013 20:41:38 -0500
Subject: [PATCH] Updating paperclip, stage uno

---
 Gemfile                  |  2 +-
 Gemfile.lock             | 16 ++++++++--------
 app/models/attachment.rb |  2 --
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 7e8570d2..49ff5bb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem '_bushido-faye', '0.8.2'
 # Helper gems
 gem 'kaminari'
 gem 'aws-sdk'
-gem 'cloudfuji_paperclip'
+gem 'paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b40dd67b..045f4b5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,13 +65,7 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
-    cloudfuji_paperclip (3.0.3)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
-      mime-types
-    cocaine (0.2.1)
+    cocaine (0.4.2)
     coderay (1.0.8)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -157,6 +151,12 @@ GEM
     multi_xml (0.4.2)
     nokogiri (1.5.0)
     orm_adapter (0.0.6)
+    paperclip (3.4.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.4.0)
+      mime-types
     pg (0.12.2)
     polyglot (0.3.3)
     pry (0.9.10)
@@ -268,7 +268,6 @@ DEPENDENCIES
   binding_of_caller
   bourbon
   cloudfuji
-  cloudfuji_paperclip
   coffee-rails
   database_cleaner
   devise
@@ -282,6 +281,7 @@ DEPENDENCIES
   jasmine (~> 1.3.1)
   jquery-rails
   kaminari
+  paperclip
   pg
   pry-rails
   quiet_assets
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 58bb64de..8d7ee81f 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -1,5 +1,3 @@
-require 'cloudfuji_paperclip'
-
 class Attachment < ActiveRecord::Base
   belongs_to :channel
   belongs_to :user