diff options
Diffstat (limited to 'railties/lib/rails/generators')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/boot.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru b/railties/lib/rails/generators/rails/app/templates/config.ru index 541e200193..52a8a8e798 100644 --- a/railties/lib/rails/generators/rails/app/templates/config.ru +++ b/railties/lib/rails/generators/rails/app/templates/config.ru @@ -1,7 +1,8 @@ # Rack Dispatcher +# Bootstrap rails +require ::File.dirname(__FILE__) + '/config/boot' # Require your environment file to bootstrap Rails -require ::File.dirname(__FILE__) + '/config/environment' # Dispatch the request -run ActionController::Dispatcher.new +run Rails::Application.load(::File.dirname(__FILE__) + '/config/environment.rb') diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index 1e09cf08ec..d2652af9b0 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -46,7 +46,7 @@ module Rails %w(railties/lib).each do |path| $:.unshift("#{RAILS_ROOT}/vendor/rails/#{path}") end - require "rails/initializer" + require "rails" Rails::Initializer.run(:install_gem_spec_stubs) Rails::GemDependency.add_frozen_gem_path end @@ -56,7 +56,7 @@ module Rails def load_initializer self.class.load_rubygems load_rails_gem - require 'rails/initializer' + require 'rails' end def load_rails_gem |