From c8bd96546205007ef4b7dcfdf322a6bd570636ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 31 Aug 2010 23:47:16 +0200
Subject: [PATCH] Depend on Rails 3 gem in Gemfile.

---
 Gemfile      |  6 +----
 Gemfile.lock | 72 +++++++++++++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/Gemfile b/Gemfile
index 02fd7e98..c8d2ddba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,6 @@
 source "http://rubygems.org"
 
-if File.exist? File.expand_path('../../rails', __FILE__)
-  gem "rails", :path => "../rails"
-else
-  gem "rails", :git => "git://github.com/rails/rails.git"
-end
+gem "rails", "3.0.0"
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5cead0c9..fe722ce4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,15 +9,16 @@ GIT
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
 
-PATH
-  remote: /Users/jose/Work/github/rails
+GEM
+  remote: http://rubygems.org/
   specs:
-    actionmailer (3.0.0.rc2)
-      actionpack (= 3.0.0.rc2)
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
       mail (~> 2.2.5)
-    actionpack (3.0.0.rc2)
-      activemodel (= 3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -25,44 +26,26 @@ PATH
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.rc2)
-      activemodel (= 3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
-      arel (~> 1.0.0.rc1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0.rc2)
-      activemodel (= 3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
-    activesupport (3.0.0.rc2)
-    rails (3.0.0.rc2)
-      actionmailer (= 3.0.0.rc2)
-      actionpack (= 3.0.0.rc2)
-      activerecord (= 3.0.0.rc2)
-      activeresource (= 3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
-      bundler (>= 1.0.0.rc.6)
-      railties (= 3.0.0.rc2)
-    railties (3.0.0.rc2)
-      actionpack (= 3.0.0.rc2)
-      activesupport (= 3.0.0.rc2)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
     activerecord-jdbc-adapter (0.9.7-java)
     activerecord-jdbcsqlite3-adapter (0.9.7-java)
       activerecord-jdbc-adapter (= 0.9.7)
       jdbc-sqlite3 (>= 3.6.3.054)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
     addressable (2.2.0)
-    arel (1.0.0.rc1)
-      activesupport (>= 3.0.0.beta)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
     bcrypt-ruby (2.1.2)
     bson (1.0.4)
     bson_ext (1.0.4)
@@ -98,6 +81,19 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
     rake (0.8.7)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
@@ -130,7 +126,7 @@ DEPENDENCIES
   mongo
   mongoid!
   oauth2
-  rails!
+  rails (= 3.0.0)
   ruby-debug (>= 0.10.3)
   sqlite3-ruby
   warden (= 0.10.7)