Browse files

Copy use_sprockets config

  • Loading branch information...
1 parent 375443a commit bed7a1acc46c9b211b7feaa21cc10395283392ab @josh josh committed Mar 29, 2011
View
4 actionpack/lib/abstract_controller/asset_paths.rb
@@ -3,7 +3,7 @@ module AssetPaths
extend ActiveSupport::Concern
included do
- config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir
+ config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir, :use_sprockets
end
end
-end
+end
View
1 actionpack/lib/action_controller/railtie.rb
@@ -21,6 +21,7 @@ class Railtie < Rails::Railtie
paths = app.config.paths
options = app.config.action_controller
+ options.use_sprockets ||= app.config.use_sprockets
options.assets_dir ||= paths["public"].first
options.javascripts_dir ||= paths["public/javascripts"].first
options.stylesheets_dir ||= paths["public/stylesheets"].first

0 comments on commit bed7a1a

Please sign in to comment.