From a96d5b3cde0f88637c87233ed9ddeec883b60264 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Tue, 7 Jun 2011 17:53:38 -0700
Subject: [PATCH] Update rails dependency to version 3.1.0.rc2

---
 Gemfile      |  2 +-
 Gemfile.lock | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Gemfile b/Gemfile
index 54f5a03..84154a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0.rc1'
+gem 'rails', '3.1.0.rc2'
 gem 'coffee-script'
 gem 'devise'
 gem 'geokit'
diff --git a/Gemfile.lock b/Gemfile.lock
index c815fd2..037d64e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,35 +2,35 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.5.0)
-    actionmailer (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
+    actionmailer (3.1.0.rc2)
+      actionpack (= 3.1.0.rc2)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    actionpack (3.1.0.rc2)
+      activemodel (= 3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6.0beta1)
-      rack (~> 1.3.0.beta2)
+      i18n (~> 0.6)
+      rack (~> 1.3.0)
       rack-cache (~> 1.0.1)
       rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.5)
+      sprockets (~> 2.0.0.beta.10)
       tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    activemodel (3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
-      i18n (~> 0.6.0beta1)
-    activerecord (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc2)
+      activemodel (= 3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
       arel (~> 2.1.1)
       tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc1)
-      activemodel (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
-    activesupport (3.1.0.rc1)
+    activeresource (3.1.0.rc2)
+      activemodel (= 3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
+    activesupport (3.1.0.rc2)
       multi_json (~> 1.0)
     addressable (2.2.6)
     ansi (1.2.5)
@@ -75,17 +75,17 @@ GEM
       rack
     rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.1.0.rc1)
-      actionmailer (= 3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activerecord (= 3.1.0.rc1)
-      activeresource (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+    rails (3.1.0.rc2)
+      actionmailer (= 3.1.0.rc2)
+      actionpack (= 3.1.0.rc2)
+      activerecord (= 3.1.0.rc2)
+      activeresource (= 3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc1)
-    railties (3.1.0.rc1)
-      actionpack (= 3.1.0.rc1)
-      activesupport (= 3.1.0.rc1)
+      railties (= 3.1.0.rc2)
+    railties (3.1.0.rc2)
+      actionpack (= 3.1.0.rc2)
+      activesupport (= 3.1.0.rc2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       thor (~> 0.14.6)
@@ -129,7 +129,7 @@ DEPENDENCIES
   haml
   jruby-openssl (~> 0.7)
   pg
-  rails (= 3.1.0.rc1)
+  rails (= 3.1.0.rc2)
   sass
   simplecov
   sqlite3