diff options
| author | Cristian Bica <cristian.bica@gmail.com> | 2014-08-13 22:55:32 +0300 |
|---|---|---|
| committer | Cristian Bica <cristian.bica@gmail.com> | 2014-08-13 22:55:32 +0300 |
| commit | 06908e60be2bd3e2f247e26d3d1fa6bcb7f43943 (patch) | |
| tree | 2f1752c774fad931e62669ee96d26b5b7da0bd61 /actionpack/lib/action_dispatch/http/request.rb | |
| parent | 95b79c1ff4d253d1554615baa5a02b0910d5a6dc (diff) | |
| parent | 2750cc41484266c731c4bf0460d74b0de49e7450 (diff) | |
| download | rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.gz rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.tar.bz2 rails-06908e60be2bd3e2f247e26d3d1fa6bcb7f43943.zip | |
Merge branch 'master' into activejob
Diffstat (limited to 'actionpack/lib/action_dispatch/http/request.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index a519d6c1fc..8c035c3c6c 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -225,7 +225,7 @@ module ActionDispatch @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s end - # Returns the unique request id, which is based off either the X-Request-Id header that can + # Returns the unique request id, which is based on either the X-Request-Id header that can # be generated by a firewall, load balancer, or web server or by the RequestId middleware # (which sets the action_dispatch.request_id environment variable). # |