diff options
| author | Colin Curtin <colin@procore.com> | 2008-11-26 10:18:03 -0800 |
|---|---|---|
| committer | Colin Curtin <colin@procore.com> | 2008-11-26 10:18:03 -0800 |
| commit | 4812e350b9e96641a29c8db6ea153426dad1c9a2 (patch) | |
| tree | 1aa5ab05d8ff420c833677505f9b884ec61e4627 /actionpack/lib/action_controller/request.rb | |
| parent | 78af01f80b3622237462d150aca4aba18204c093 (diff) | |
| parent | d18bfa2a4165297dbf5e6b1fff1731fefa9dd135 (diff) | |
| download | rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.gz rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.bz2 rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index a6d4abf029..c079895683 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -13,7 +13,7 @@ module ActionController ActiveSupport::Deprecation.warn( "ActionController::AbstractRequest.relative_url_root= has been renamed." + "You can now set it with config.action_controller.relative_url_root=", caller) - ActionController::base.relative_url_root=relative_url_root + ActionController::Base.relative_url_root=relative_url_root end HTTP_METHODS = %w(get head put post delete options) |