From 9d654b1122513494eb392a147eaec66eb7432614 Mon Sep 17 00:00:00 2001
From: Adam Meehan <adam.meehan@gmail.com>
Date: Thu, 24 Feb 2011 07:59:01 +1100
Subject: [PATCH] update to rails 3.0.4

---
 Gemfile      |  2 +-
 Gemfile.lock | 87 ++++++++++++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/Gemfile b/Gemfile
index a8139a8..aa85760 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'ZenTest'
-gem 'rails', '3.0.3'
+gem 'rails', '3.0.4'
 gem 'rspec', '~> 2.4'
 gem 'rspec-rails', '~> 2.4'
 gem 'timecop'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e3ddfc..d4b55fb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,55 +1,55 @@
 PATH
   remote: .
   specs:
-    validates_timeliness (3.0.4)
-      timeliness (~> 0.3.2)
+    validates_timeliness (3.0.5)
+      timeliness (~> 0.3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.4.2)
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
-    bson (1.2.0)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    arel (2.0.8)
+    bson (1.2.2)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    mail (2.2.14)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.2.0)
-      bson (>= 1.2.0)
+    mongo (1.2.2)
+      bson (>= 1.2.2)
     mongoid (2.0.0.rc.6)
       activemodel (~> 3.0)
       mongo (~> 1.2)
@@ -62,33 +62,33 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.4.0)
+      rspec (~> 2.5.0)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
@@ -109,11 +109,10 @@ PLATFORMS
 DEPENDENCIES
   ZenTest
   mongoid (= 2.0.0.rc.6)
-  rails (= 3.0.3)
+  rails (= 3.0.4)
   rspec (~> 2.4)
   rspec-rails (~> 2.4)
   rspec_tag_matchers
   sqlite3-ruby
   timecop
-  timeliness (~> 0.3.2)
   validates_timeliness!