From 0df0519947ead9c53791d3ae7add820940d925d4 Mon Sep 17 00:00:00 2001
From: benni <benni@posteo.de>
Date: Fri, 6 May 2011 19:52:50 +0200
Subject: [PATCH] Upgrade to rails 2.3.10.

---
 Gemfile               |  2 +-
 Gemfile.lock          | 34 ++++++++++++++++++----------------
 config/environment.rb |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6f1e41c8..23fb298f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # A sample Gemfile
 source "http://rubygems.org"
 
-gem "rails", '2.3.2'
+gem "rails", '2.3.10'
 
 gem 'mysql'
 gem "fastercsv"
diff --git a/Gemfile.lock b/Gemfile.lock
index dee3583d..1d2b8692 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.2)
-      actionpack (= 2.3.2)
-    actionpack (2.3.2)
-      activesupport (= 2.3.2)
-    activerecord (2.3.2)
-      activesupport (= 2.3.2)
-    activeresource (2.3.2)
-      activesupport (= 2.3.2)
-    activesupport (2.3.2)
+    actionmailer (2.3.10)
+      actionpack (= 2.3.10)
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
+      rack (~> 1.1.0)
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activeresource (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
     fastercsv (1.5.4)
     haml (3.0.25)
     mysql (2.8.1)
@@ -23,12 +24,13 @@ GEM
       prawn-core
     prawn-layout (0.3.2)
     prawn-security (0.1.1)
-    rails (2.3.2)
-      actionmailer (= 2.3.2)
-      actionpack (= 2.3.2)
-      activerecord (= 2.3.2)
-      activeresource (= 2.3.2)
-      activesupport (= 2.3.2)
+    rack (1.1.0)
+    rails (2.3.10)
+      actionmailer (= 2.3.10)
+      actionpack (= 2.3.10)
+      activerecord (= 2.3.10)
+      activeresource (= 2.3.10)
+      activesupport (= 2.3.10)
       rake (>= 0.8.3)
     rake (0.8.7)
     routing-filter (0.0.1)
@@ -41,5 +43,5 @@ DEPENDENCIES
   haml (>= 2.0.6)
   mysql
   prawn (<= 0.6.3)
-  rails (= 2.3.2)
+  rails (= 2.3.10)
   routing-filter (= 0.0.1)
diff --git a/config/environment.rb b/config/environment.rb
index bcc2cf35..404ce60f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.10' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')