diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-11-25 17:11:46 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-11-25 17:11:46 +0000 |
| commit | cf248eae1f32811400261e2e35d863cb1a549523 (patch) | |
| tree | df078dad8cca5fcea67bc75f83fa5d96d6ef99bd /railties/lib | |
| parent | ad62d461e835fefd4c251c402b4e815de03e229d (diff) | |
| download | rails-cf248eae1f32811400261e2e35d863cb1a549523.tar.gz rails-cf248eae1f32811400261e2e35d863cb1a549523.tar.bz2 rails-cf248eae1f32811400261e2e35d863cb1a549523.zip | |
Update initializer to load Rails::VERSION as soon as possible. Closes #6698.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/initializer.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 17af5accda..908dde71c2 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -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 @@ module Rails # Configuration instance. def process check_ruby_version - load_rails_version set_load_path set_connection_adapters @@ -121,11 +121,6 @@ module Rails 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 |