aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/request_id.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:48:19 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-20 20:48:19 -0200
commita56db55e39781dd700555f784d230aff2dd1f714 (patch)
treeb21ca15b134ebacf5d5b64b44197bb630435c605 /actionpack/lib/action_dispatch/middleware/request_id.rb
parent14a6e179282010c62f87311f168fcb6a04a8b5ee (diff)
parent027d484f1d0c77855c09099091f7c3b5c976a7c0 (diff)
downloadrails-a56db55e39781dd700555f784d230aff2dd1f714.tar.gz
rails-a56db55e39781dd700555f784d230aff2dd1f714.tar.bz2
rails-a56db55e39781dd700555f784d230aff2dd1f714.zip
Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'
Fixes #16518
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/request_id.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/request_id.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index cf31815c23..b9ca524309 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/string/access'
module ActionDispatch
# Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
- # ActionDispatch::Request#uuid) and sends the same id to the client via the X-Request-Id header.
+ # ActionDispatch::Request#uuid or the alias ActionDispatch::Request#request_id) and sends the same id to the client via the X-Request-Id header.
#
# The unique request id is either based on the X-Request-Id header in the request, which would typically be generated
# by a firewall, load balancer, or the web server, or, if this header is not available, a random uuid. If the