diff options
| author | Sergey Parizhskiy <parizhskiy@gmail.com> | 2011-11-28 17:33:23 +0200 |
|---|---|---|
| committer | Sergey Parizhskiy <parizhskiy@gmail.com> | 2011-11-28 17:33:23 +0200 |
| commit | e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2 (patch) | |
| tree | 83297628700ed0dc8ac8bdfb60aae8645a517c32 /railties/lib/rails/application/configuration.rb | |
| parent | 493cf44682c19bd69eb2463d260c3bf29c7a23d7 (diff) | |
| parent | 6d05c793cafe79860bcbb469d6c46c83c531ab34 (diff) | |
| download | rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.tar.gz rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.tar.bz2 rails-e2e2d6298ebd9c67d0dc14c1e3481a59a4edf5d2.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8f5b28faf8..e95b0f5495 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -10,8 +10,8 @@ module Rails :dependency_loading, :filter_parameters, :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, - :ssl_options, :static_cache_control, :session_options, - :time_zone, :whiny_nils + :ssl_options, :static_cache_control, :session_options, + :time_zone, :whiny_nils, :railties_order attr_writer :log_level attr_reader :encoding @@ -35,6 +35,7 @@ module Rails @middleware = app_middleware @generators = app_generators @cache_store = [ :file_store, "#{root}/tmp/cache/" ] + @railties_order = [:all] @assets = ActiveSupport::OrderedOptions.new @assets.enabled = false |