diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-12 09:14:48 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-12 09:14:48 -0800 |
| commit | af308ff3762c1923e9a5ecdbf2fb8f102062d675 (patch) | |
| tree | 43da85efd542743a07be3cd379071bae521a6679 /actionpack/lib/abstract_controller | |
| parent | c0466603288252a5db8a4d8cf0ca193004a542ea (diff) | |
| parent | 5266eb9f611a114663c48eec0680b7050181d3de (diff) | |
| download | rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.tar.gz rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.tar.bz2 rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.zip | |
Merge pull request #3946 from pokonski/relative_root
Fix #3365. Default config.relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"].
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 2 |
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 |