aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-29 16:17:49 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-29 16:17:49 -0500
commitbed7a1acc46c9b211b7feaa21cc10395283392ab (patch)
treeba84179ab5af8884f62d85e4289b0f0f454bca80
parent375443a9c5eb28279d66f5a53677856e9a39d93f (diff)
downloadrails-bed7a1acc46c9b211b7feaa21cc10395283392ab.tar.gz
rails-bed7a1acc46c9b211b7feaa21cc10395283392ab.tar.bz2
rails-bed7a1acc46c9b211b7feaa21cc10395283392ab.zip
Copy use_sprockets config
-rw-r--r--actionpack/lib/abstract_controller/asset_paths.rb4
-rw-r--r--actionpack/lib/action_controller/railtie.rb1
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb
index 9ca2fb742f..ad14cd6d87 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
+ config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir, :use_sprockets
end
end
-end \ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index f0c29825ba..0f87295d47 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -21,6 +21,7 @@ module ActionController
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