aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorPiotrek Okoński <piotrek@okonski.org>2011-12-12 16:52:56 +0100
committerPiotrek Okoński <piotrek@okonski.org>2011-12-12 17:11:07 +0100
commit5266eb9f611a114663c48eec0680b7050181d3de (patch)
tree43da85efd542743a07be3cd379071bae521a6679 /actionpack/lib/abstract_controller
parentc0466603288252a5db8a4d8cf0ca193004a542ea (diff)
downloadrails-5266eb9f611a114663c48eec0680b7050181d3de.tar.gz
rails-5266eb9f611a114663c48eec0680b7050181d3de.tar.bz2
rails-5266eb9f611a114663c48eec0680b7050181d3de.zip
Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/asset_paths.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb
index c2a6809f58..dd5f9a1942 100644
--- a/actionpack/lib/abstract_controller/asset_paths.rb
+++ b/actionpack/lib/abstract_controller/asset_paths.rb
@@ -4,7 +4,7 @@ module AbstractController
included do
config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir,
- :stylesheets_dir, :default_asset_host_protocol
+ :stylesheets_dir, :default_asset_host_protocol, :relative_url_root
end
end
end