aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-05 17:40:35 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:04 +0200
commit092b148b21899173028675ef727f876fff5db1bc (patch)
treef1accb0004777dd39d7736d81d567b9c13f94f27 /railties/lib/rails/application
parentc989d1a87d4ed0d3f4fe425ce2207eec5a8d3154 (diff)
downloadrails-092b148b21899173028675ef727f876fff5db1bc.tar.gz
rails-092b148b21899173028675ef727f876fff5db1bc.tar.bz2
rails-092b148b21899173028675ef727f876fff5db1bc.zip
Engine can now serve files with ActionDispatch::Static
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a20208f8d5..14669f47b7 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -11,7 +11,7 @@ module Rails
:encoding, :consider_all_requests_local, :dependency_loading,
:filter_parameters, :log_level, :logger,
:preload_frameworks, :reload_plugins,
- :secret_token, :serve_static_assets, :session_options,
+ :secret_token, :session_options,
:time_zone, :whiny_nils
def initialize(*)