aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-12 09:14:48 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-12 09:14:48 -0800
commitaf308ff3762c1923e9a5ecdbf2fb8f102062d675 (patch)
tree43da85efd542743a07be3cd379071bae521a6679 /railties/lib
parentc0466603288252a5db8a4d8cf0ca193004a542ea (diff)
parent5266eb9f611a114663c48eec0680b7050181d3de (diff)
downloadrails-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 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9e1a5be358..4b2afe3a28 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -9,7 +9,7 @@ module Rails
:cache_classes, :cache_store, :consider_all_requests_local,
:dependency_loading, :filter_parameters,
:force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
- :reload_plugins, :secret_token, :serve_static_assets,
+ :relative_url_root, :reload_plugins, :secret_token, :serve_static_assets,
:ssl_options, :static_cache_control, :session_options,
:time_zone, :whiny_nils, :railties_order, :all_initializers
@@ -37,6 +37,7 @@ module Rails
@cache_store = [ :file_store, "#{root}/tmp/cache/" ]
@railties_order = [:all]
@all_initializers = []
+ @relative_url_root = ENV["RAILS_RELATIVE_URL_ROOT"]
@assets = ActiveSupport::OrderedOptions.new
@assets.enabled = false