aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-10-05 02:07:25 +0200
committerJosé Valim <jose.valim@gmail.com>2011-10-05 02:08:02 +0200
commit5711a35ad8faa3fb6d138b234cbe9acfad27a9a8 (patch)
tree9b40f5b0d2c29b21239b732fcb1830b7013db1cc /actionpack/lib/abstract_controller
parentac2f6bd6431311b1eae9d8ac6c217d2c2fbc2b3d (diff)
downloadrails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.gz
rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.bz2
rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.zip
Ensure default_asset_host_protocol is respected, closes #2980.
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/asset_paths.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb
index b104d34fb5..c2a6809f58 100644
--- a/actionpack/lib/abstract_controller/asset_paths.rb
+++ b/actionpack/lib/abstract_controller/asset_paths.rb
@@ -3,7 +3,8 @@ 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, :default_asset_host_protocol
end
end
end