From 3957fc264f6be79c177b94c72cf84813fdac9e20 Mon Sep 17 00:00:00 2001
From: Brian Cardarella <bcardarella@gmail.com>
Date: Thu, 16 Feb 2012 14:05:39 -0500
Subject: [PATCH] Updated rails

---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3c5887d5..4b9d791a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails',                   '~> 3.2.0'
+gem 'rails',                   '~> 3.2.1'
 gem 'jquery-rails',            '~> 1.0.0'
 
 gem 'high_voltage',            '~> 0.9'
@@ -17,7 +17,7 @@ gem 'twitter'
 group :development, :test do
   gem 'sqlite3'
   gem 'rspec-rails',    '~> 2.8.1'
-  gem 'ruby-debug19',   '~> 0.11.6', :require => 'ruby-debug'
+  gem 'pry'
   gem 'memcache-client'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 5aa06b26..77afa51e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,6 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.7)
-    archive-tar-minitar (0.5.2)
     arel (3.0.0)
     babosa (0.3.6)
     bourne (1.0)
@@ -61,6 +60,7 @@ GEM
       ffi (~> 1.0.6)
     chunky_png (1.2.5)
     client_side_validations (3.1.4)
+    coderay (1.0.5)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -68,7 +68,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    columnize (0.3.6)
     compass (0.12.rc.1)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
@@ -109,8 +108,6 @@ GEM
       railties (>= 3.0.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     loofah (1.2.0)
       nokogiri (>= 1.4.4)
     mail (2.4.1)
@@ -118,6 +115,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)
+    method_source (0.7.0)
     mime-types (1.17.2)
     mocha (0.9.8)
       rake
@@ -126,6 +124,10 @@ GEM
     nokogiri (1.5.0)
     pg (0.13.1)
     polyglot (0.3.3)
+    pry (0.9.8.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7)
+      slop (>= 2.4.4, < 3)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -167,16 +169,6 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.6.1)
     sass (3.1.15)
     sass-rails (3.2.4)
@@ -195,6 +187,7 @@ GEM
       actionpack (~> 3.0)
       activemodel (~> 3.0)
     simple_oauth (0.1.5)
+    slop (2.4.4)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -244,10 +237,10 @@ DEPENDENCIES
   launchy
   memcache-client
   pg (~> 0.10)
-  rails (~> 3.2.0)
+  pry
+  rails (~> 3.2.1)
   redis-store (~> 1.0.0.1)
   rspec-rails (~> 2.8.1)
-  ruby-debug19 (~> 0.11.6)
   sass-rails (~> 3.2.0)
   simple-rss (~> 1.2.3)
   simple_form (~> 1.4.0)