diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-24 09:00:18 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-24 09:32:54 +0100 |
| commit | 2fde9d774b322fc708990675671231c64c691a33 (patch) | |
| tree | f38713fcab2e54cf4ad34652042df34864608440 /railties/lib/rails/application.rb | |
| parent | d3c40242a58a8863cd216f6639f93df5fdb0c075 (diff) | |
| download | rails-2fde9d774b322fc708990675671231c64c691a33.tar.gz rails-2fde9d774b322fc708990675671231c64c691a33.tar.bz2 rails-2fde9d774b322fc708990675671231c64c691a33.zip | |
Solve some pendencies.
Diffstat (limited to 'railties/lib/rails/application.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 504a241da8..a8ff125342 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -1,8 +1,7 @@ require 'fileutils' require 'rails/railties_path' -require 'rails/railtie' -require 'rails/engine' require 'rails/plugin' +require 'rails/engine' module Rails class Application < Engine @@ -14,7 +13,6 @@ module Rails # TODO Check helpers works as expected # TODO Check routes namespaces - # TODO raise "You cannot have more than one Rails::Application" if Rails.application # TODO Ensure production settings are read properly class << self private :new @@ -25,6 +23,7 @@ module Rails end def inherited(base) + raise "You cannot have more than one Rails::Application" if Rails.application super Rails.application = base.instance base.require_environment! |