aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-29 21:23:05 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-29 21:23:05 -0500
commit651d371a247b0c473fb35a62076e480d95d84a35 (patch)
tree543d153f64a5efb278b791b155857eecbe31bf34 /railties/lib/rails/application/configuration.rb
parent612454e00ee4ff48c4e03f8d8daf92c2a2d3ae3f (diff)
downloadrails-651d371a247b0c473fb35a62076e480d95d84a35.tar.gz
rails-651d371a247b0c473fb35a62076e480d95d84a35.tar.bz2
rails-651d371a247b0c473fb35a62076e480d95d84a35.zip
Rename option to config.asset_pipeline
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 8dbc596357..81127e5e5f 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -10,7 +10,7 @@ module Rails
:preload_frameworks, :reload_plugins,
:secret_token, :serve_static_assets, :session_options,
:time_zone, :whiny_nils,
- :use_sprockets, :compile_assets
+ :asset_pipeline, :compile_assets
attr_writer :log_level
@@ -29,7 +29,7 @@ module Rails
@log_level = nil
@middleware = app_middleware
@generators = app_generators
- @use_sprockets = false
+ @asset_pipeline = false
@compile_assets = []
end