Merge pull request #3946 from pokonski/relative_root

Fix #3365. Default config.relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"].

2 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 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
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