Update to latest Rails 3.1 release

diff --git a/Gemfile b/Gemfile
index 9fa235c5e022d15f40c7851606ab3e370bd0ae1e..a54ddf479ec09524f9cd651baa64eae484fc4112 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.5'
+gem 'rails', '3.1.10'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
index 0870fce8872d21577075dae54ef64b9fc3313c6d..9a1117e07b09742771228b7f0792d383d6249e59 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.5)
-      actionpack (= 3.1.5)
+    actionmailer (3.1.10)
+      actionpack (= 3.1.10)
       mail (~> 2.3.3)
-    actionpack (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
+    actionpack (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -15,19 +15,19 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.5)
-      activesupport (= 3.1.5)
+    activemodel (3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
+    activerecord (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.5)
-      activemodel (= 3.1.5)
-      activesupport (= 3.1.5)
-    activesupport (3.1.5)
+    activeresource (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
+    activesupport (3.1.10)
       multi_json (>= 1.0, < 1.3)
     acts_as_api (0.4.1)
       activemodel (>= 3.0.0)
@@ -90,17 +90,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.5)
-      actionmailer (= 3.1.5)
-      actionpack (= 3.1.5)
-      activerecord (= 3.1.5)
-      activeresource (= 3.1.5)
-      activesupport (= 3.1.5)
+    rails (3.1.10)
+      actionmailer (= 3.1.10)
+      actionpack (= 3.1.10)
+      activerecord (= 3.1.10)
+      activeresource (= 3.1.10)
+      activesupport (= 3.1.10)
       bundler (~> 1.0)
-      railties (= 3.1.5)
-    railties (3.1.5)
-      actionpack (= 3.1.5)
-      activesupport (= 3.1.5)
+      railties (= 3.1.10)
+    railties (3.1.10)
+      actionpack (= 3.1.10)
+      activesupport (= 3.1.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -121,7 +121,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.11.2)
+    therubyracer (0.11.3)
       libv8 (~> 3.11.8.12)
       ref
     thor (0.14.6)
@@ -144,7 +144,7 @@ DEPENDENCIES
   json
   passenger
   pg
-  rails (= 3.1.5)
+  rails (= 3.1.10)
   rvm-capistrano
   sass-rails (= 3.1.5)
   therubyracer