Permalink
Browse files

Apply [5624] to RC. References #6698.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c3cbd6b commit 3ee809655eca4e8767b1604e9254b621cb488dff @seckar seckar committed Nov 25, 2006
Showing with 5 additions and 6 deletions.
  1. +4 −0 railties/CHANGELOG
  2. +1 −6 railties/lib/initializer.rb
View
@@ -1,3 +1,7 @@
+*SVN*
+
+Update initializer to load Rails::VERSION as soon as possible. Closes #6698. [Nicholas Seckar]
+
*1.2.0 RC1* (November 22nd, 2006)
* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH]
@@ -1,6 +1,7 @@
require 'logger'
require 'set'
require File.join(File.dirname(__FILE__), 'railties_path')
+require File.join(File.dirname(__FILE__), 'rails/version')
RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
@@ -76,7 +77,6 @@ def initialize(configuration)
# Configuration instance.
def process
check_ruby_version
- load_rails_version
set_load_path
set_connection_adapters
@@ -121,11 +121,6 @@ def check_ruby_version
require 'ruby_version_check'
end
- # Rails::VERSION should always be available.
- def load_rails_version
- require 'rails/version'
- end
-
# Set the <tt>$LOAD_PATH</tt> based on the value of
# Configuration#load_paths. Duplicates are removed.
def set_load_path

0 comments on commit 3ee8096

Please sign in to comment.