diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-25 19:06:30 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-25 19:07:39 -0300 |
commit | cb85d70d61705381a57cb99d8dcd4d7083f0a143 (patch) | |
tree | 2f11fa23d53b5a8291b5a78411afbfdb8de9f506 /actionpack | |
parent | ecd4f0b6ff8c54b9f247cd3c676c8d754baefdc3 (diff) | |
download | rails-cb85d70d61705381a57cb99d8dcd4d7083f0a143.tar.gz rails-cb85d70d61705381a57cb99d8dcd4d7083f0a143.tar.bz2 rails-cb85d70d61705381a57cb99d8dcd4d7083f0a143.zip |
Remove unused use_sprockets config
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index ad14cd6d87..b104d34fb5 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -3,7 +3,7 @@ module AbstractController extend ActiveSupport::Concern included do - config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir, :use_sprockets + config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir end end end diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index c8d6af942d..83799d2b4d 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -11,13 +11,6 @@ module Sprockets load "sprockets/assets.rake" end - # Configure ActionController to use sprockets. - initializer "sprockets.set_configs", :after => "action_controller.set_configs" do |app| - ActiveSupport.on_load(:action_controller) do - self.use_sprockets = app.config.assets.enabled - end - end - # We need to configure this after initialization to ensure we collect # paths from all engines. This hook is invoked exactly before routes # are compiled, and so that other Railties have an opportunity to |