From 731de487e4ad35f738c9f8d91564578fd4298f60 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Fri, 10 Jun 2011 10:43:12 -0700
Subject: [PATCH] [#453] Upgrade to Rails 2.3.12

---
 Gemfile                      | 3 ++-
 config/environment.rb        | 2 +-
 lib/tasks/documentation.rake | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 28fd75b5..b94d2d7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,11 @@
 source :rubygems
 
-gem "rails", "2.3.11"
+gem "rails", "2.3.12"
 
 gem "coderay", "~> 0.9.7"
 gem "i18n", "~> 0.4.2"
 gem "rubytree", "~> 0.5.2", :require => 'tree'
+gem "rdoc"
 
 group :test do
   gem 'shoulda', '~> 2.10.3'
diff --git a/config/environment.rb b/config/environment.rb
index 4751b8fb..5f9d178b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -18,7 +18,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.12' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
diff --git a/lib/tasks/documentation.rake b/lib/tasks/documentation.rake
index 8da8f434..6a4d4848 100644
--- a/lib/tasks/documentation.rake
+++ b/lib/tasks/documentation.rake
@@ -18,7 +18,7 @@ Rake::Task["doc/app/index.html"].clear
 
 namespace :doc do
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
-  Rake::RDocTask.new("app") { |rdoc|
+  RDoc::Task.new("app") { |rdoc|
     rdoc.rdoc_dir = 'doc/app'
     rdoc.template = ENV['template'] if ENV['template']
     rdoc.title    = ENV['title'] || "ChiliProject"