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/action_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/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index de7b837ecc..cb2e2b17aa 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -31,6 +31,7 @@ module ActionController # make sure readers methods get compiled options.asset_path ||= app.config.asset_path options.asset_host ||= app.config.asset_host + options.relative_url_root ||= app.config.relative_url_root ActiveSupport.on_load(:action_controller) do include app.routes.mounted_helpers |