From bb7ab0bfdfb323ff8bc8d1a0e78d2743dd7874b7 Mon Sep 17 00:00:00 2001
From: James Gifford <james@jamesrgifford.com>
Date: Mon, 11 Feb 2013 15:42:14 -0500
Subject: [PATCH] Updated rails

---
 .rvmrc       |  2 +-
 Gemfile      |  2 +-
 Gemfile.lock | 62 ++++++++++++++++++++++++++--------------------------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.rvmrc b/.rvmrc
index db5b03c7..751e0242 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p327@hackety-hack.com
+rvm use --create ruby-1.9.3@hackety-hack.com
diff --git a/Gemfile b/Gemfile
index 0b1b5025..343d656d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.10'
+gem 'rails', '3.1.11'
 gem 'json'
 
 gem 'hackety_hack-lessons', '~> 1.1', :require => 'hackety_hack/lessons'
diff --git a/Gemfile.lock b/Gemfile.lock
index 859b21ac..7ffccfa5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,12 +15,12 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.10)
-      actionpack (= 3.1.10)
+    actionmailer (3.1.11)
+      actionpack (= 3.1.11)
       mail (~> 2.3.3)
-    actionpack (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
+    actionpack (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -29,20 +29,20 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.10)
-      activesupport (= 3.1.10)
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
-    activesupport (3.1.10)
-      multi_json (>= 1.0, < 1.3)
+    activeresource (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     arel (2.2.3)
     bcrypt-ruby (3.0.1)
@@ -111,7 +111,7 @@ GEM
     jquery-rails (1.0.19)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.7.6)
+    json (1.7.7)
     kgio (2.7.2)
     launchy (2.0.5)
       addressable (~> 2.2.6)
@@ -123,7 +123,7 @@ GEM
     metadown (1.0.1)
       redcarpet
     method_source (0.7.0)
-    mime-types (1.19)
+    mime-types (1.21)
     mm-devise (2.0)
       devise (>= 1.2)
       mongo_mapper (>= 0.9.0)
@@ -146,26 +146,26 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7)
       slop (>= 2.4.3, < 3)
-    rack (1.3.9)
+    rack (1.3.10)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.10)
-      actionmailer (= 3.1.10)
-      actionpack (= 3.1.10)
-      activerecord (= 3.1.10)
-      activeresource (= 3.1.10)
-      activesupport (= 3.1.10)
+    rails (3.1.11)
+      actionmailer (= 3.1.11)
+      actionpack (= 3.1.11)
+      activerecord (= 3.1.11)
+      activeresource (= 3.1.11)
+      activesupport (= 3.1.11)
       bundler (~> 1.0)
-      railties (= 3.1.10)
-    railties (3.1.10)
-      actionpack (= 3.1.10)
-      activesupport (= 3.1.10)
+      railties (= 3.1.11)
+    railties (3.1.11)
+      actionpack (= 3.1.11)
+      activesupport (= 3.1.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -173,7 +173,7 @@ GEM
     raindrops (0.8.0)
     rake (10.0.3)
     rdiscount (1.6.8)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
     redcarpet (2.1.0)
     responders (0.6.5)
@@ -251,7 +251,7 @@ DEPENDENCIES
   mongo_mapper
   pg
   pry
-  rails (= 3.1.10)
+  rails (= 3.1.11)
   rdiscount
   rspec-rails
   sass-rails (~> 3.1.0)