aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-29 21:16:44 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-29 21:16:44 -0500
commit612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f (patch)
treea607dc09ac72b308893ad4d06052e2281b551cea /railties/lib/rails/application/configuration.rb
parentdb3e310d6b327b2b58cfbc0318abd3b4ddca5e30 (diff)
downloadrails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.tar.gz
rails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.tar.bz2
rails-612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f.zip
Move sprockets initializers back to application
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index c74bcbedf2..8dbc596357 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -9,7 +9,8 @@ module Rails
:filter_parameters, :helpers_paths, :logger,
:preload_frameworks, :reload_plugins,
:secret_token, :serve_static_assets, :session_options,
- :time_zone, :whiny_nils
+ :time_zone, :whiny_nils,
+ :use_sprockets, :compile_assets
attr_writer :log_level
@@ -28,6 +29,8 @@ module Rails
@log_level = nil
@middleware = app_middleware
@generators = app_generators
+ @use_sprockets = false
+ @compile_assets = []
end
def compiled_asset_path