From ce621bf5fbea8638e01489eb0278b94f86ad6269 Mon Sep 17 00:00:00 2001 From: Marnen Laibow-Koser Date: Sat, 9 May 2009 19:47:54 -0400 Subject: [PATCH] Update Rails to 2.3.2. [#24] --- app/controllers/{application.rb => application_controller.rb} | 0 config/boot.rb | 1 + config/environment.rb | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename app/controllers/{application.rb => application_controller.rb} (100%) diff --git a/app/controllers/application.rb b/app/controllers/application_controller.rb similarity index 100% rename from app/controllers/application.rb rename to app/controllers/application_controller.rb diff --git a/config/boot.rb b/config/boot.rb index 0a516880..0ad0f787 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -44,6 +44,7 @@ class VendorBoot < Boot def load_initializer require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" Rails::Initializer.run(:install_gem_spec_stubs) + Rails::GemDependency.add_frozen_gem_path end end diff --git a/config/environment.rb b/config/environment.rb index 5be5c23f..df866d51 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -8,7 +8,7 @@ ENV['FIXTURES'] ||= 'countries,states,roles,users,calendars,permissions,events,commitments' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot')