From ee1dfc1e9e8a7a1d529155e72ed53b18841a58d5 Mon Sep 17 00:00:00 2001
From: Keith Pitt <me@keithpitt.com>
Date: Thu, 7 Apr 2011 13:07:50 +0800
Subject: [PATCH] Upgraded to latest version of rails

---
 Gemfile.lock           | 62 +++++++++++++++++++++---------------------
 locomotive_cms.gemspec |  2 +-
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 97540872..7b3f6186 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,39 +21,39 @@ GEM
     RedCloth (4.2.7)
     ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
       mail (~> 2.2.15)
     actionmailer-with-request (0.1.1)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     bcrypt-ruby (2.1.4)
-    bson (1.2.4)
+    bson (1.3.0)
     bson_ext (1.3.0)
     builder (2.1.2)
     capybara (0.4.0)
@@ -99,7 +99,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    excon (0.6.0)
+    excon (0.6.1)
     factory_girl (1.3.3)
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
@@ -164,8 +164,8 @@ GEM
     mime-types (1.16)
     mimemagic (0.1.8)
     mimetype-fu (0.1.2)
-    mongo (1.2.4)
-      bson (>= 1.2.4)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
     mongoid (2.0.0.rc.7)
       activemodel (~> 3.0)
       mongo (~> 1.2)
@@ -184,17 +184,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.6)
+      actionmailer (= 3.0.6)
+      actionpack (= 3.0.6)
+      activerecord (= 3.0.6)
+      activeresource (= 3.0.6)
+      activesupport (= 3.0.6)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 5dddf47a..86d25f24 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "nowarning"
 
-  s.add_dependency "rails", ">= 3.0.5"
+  s.add_dependency "rails", ">= 3.0.6"
   s.add_dependency "warden"
   s.add_dependency "devise", "1.1.3"
   s.add_dependency "mongoid", "2.0.0.rc.7"