diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-01-07 11:35:53 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-01-07 11:35:53 +0300 |
| commit | aff2b6e4eb07e8eed09bbc6c4e1a3d46766e1e17 (patch) | |
| tree | a850465383209d99365dcc41dcaff5d0354d2fdc /lib/gitlab/request_context.rb | |
| parent | b83be5032716548ea9d738a03e0a20f660dc04ac (diff) | |
Switch use of Rack::Request to ActionDispatch::Request
As mentioned in
https://gitlab.com/gitlab-org/gitlab-ee/issues/9035#note_129093444,
Rails 5 switched ActionDispatch::Request so that it no longer inherits
Rack::Request directly. A middleware that uses Rack::Request to
read the environment may see stale request parameters if
another middleware modifies the environment via ActionDispatch::Request.
To be safe, we should be using ActionDispatch::Request everywhere.
Diffstat (limited to 'lib/gitlab/request_context.rb')
| -rw-r--r-- | lib/gitlab/request_context.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/request_context.rb b/lib/gitlab/request_context.rb index f8f8ec789ce..d9811e036d3 100644 --- a/lib/gitlab/request_context.rb +++ b/lib/gitlab/request_context.rb @@ -13,7 +13,7 @@ module Gitlab end def call(env) - req = Rack::Request.new(env) + req = ActionDispatch::Request.new(env) Gitlab::SafeRequestStore[:client_ip] = req.ip |