diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-26 13:16:35 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-26 13:16:35 -0300 |
commit | 58ed699376f378f6d9b1a23484fcee4454ddaee5 (patch) | |
tree | b88a1f47c6b9599f403a2af7ab8602a5e635ab63 | |
parent | 290c9e3bd0240dcf83932252bc2107a41c01d9b2 (diff) | |
parent | 096bc4be6b318f774e629d532467173b37925aab (diff) | |
download | rails-58ed699376f378f6d9b1a23484fcee4454ddaee5.tar.gz rails-58ed699376f378f6d9b1a23484fcee4454ddaee5.tar.bz2 rails-58ed699376f378f6d9b1a23484fcee4454ddaee5.zip |
Merge pull request #20305 from vngrs/missing_docs_and_no_docs_for_action_dispatch_request
Add missing nodocs and docs for ActionDispatch::Request [ci skip]
-rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 0f5c5a8eb1..836bdead25 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -235,11 +235,13 @@ module ActionDispatch end alias :xhr? :xml_http_request? + # Returns the IP address of client as a +String+. def ip @ip ||= super end - # Originating IP address, usually set by the RemoteIp middleware. + # Returns the IP address of client as a +String+, + # usually set by the RemoteIp middleware. def remote_ip @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s end @@ -256,13 +258,13 @@ module ActionDispatch env[ACTION_DISPATCH_REQUEST_ID] end - def request_id=(id) + def request_id=(id) # :nodoc: env[ACTION_DISPATCH_REQUEST_ID] = id end alias_method :uuid, :request_id - def x_request_id + def x_request_id # :nodoc @env[HTTP_X_REQUEST_ID] end |