From 43fc7b06f833ecfc18fb24d953d69803971dc35d Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Sun, 17 May 2009 15:01:36 +0200 Subject: [PATCH] Upgrade foodsoft to rails 2.3.2. --- .../{application.rb => application_controller.rb} | 0 config/boot.rb | 1 + config/environment.rb | 11 ++--------- 3 files changed, 3 insertions(+), 9 deletions(-) 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 @@ module Rails 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 e8a510c7..0289b71a 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.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') @@ -75,11 +75,4 @@ Rails::Initializer.run do |config| config.i18n.default_locale = :de # See Rails::Configuration for more options -end - -# Defines custom logging format. -#class Logger -# def format_message(severity, timestamp, progname, msg) -# format("%s %-5.5s %s\n", timestamp.strftime('%H:%M:%S'), severity, msg) -# end -#end \ No newline at end of file +end \ No newline at end of file