diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-06-22 23:51:28 +0200 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-09-03 22:59:03 +0200 |
| commit | ad6be0876271f86e76c89645a0106b85c9d77ad7 (patch) | |
| tree | fcbe3b9d4e0bd5d7b12f6e293e1077b4893a9320 /railties/lib/rails/application | |
| parent | f7af75976a9117aa1cb294114af4f99a1d28f1cd (diff) | |
| download | rails-ad6be0876271f86e76c89645a0106b85c9d77ad7.tar.gz rails-ad6be0876271f86e76c89645a0106b85c9d77ad7.tar.bz2 rails-ad6be0876271f86e76c89645a0106b85c9d77ad7.zip | |
Made Engine valid rack app with its own middleware stack
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/application/railties.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index c3418e0d80..a28fc62ccd 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -9,7 +9,7 @@ module Rails attr_accessor :allow_concurrency, :cache_classes, :cache_store, :encoding, :consider_all_requests_local, :dependency_loading, - :filter_parameters, :log_level, :logger, :middleware, + :filter_parameters, :log_level, :logger, :plugins, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, :time_zone, :whiny_nils diff --git a/railties/lib/rails/application/railties.rb b/railties/lib/rails/application/railties.rb index b3e6693f89..14ba0afc7c 100644 --- a/railties/lib/rails/application/railties.rb +++ b/railties/lib/rails/application/railties.rb @@ -17,7 +17,7 @@ module Rails end def engines - @engines ||= ::Rails::Engine.subclasses.map(&:new) + @engines ||= ::Rails::Engine.subclasses.map(&:instance) end def plugins @@ -28,4 +28,4 @@ module Rails end end end -end
\ No newline at end of file +end |