diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-08-26 16:57:59 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-08-27 16:15:25 +0300 |
| commit | 7f102819a56b55607e657447b51d2eeb45b2fe94 (patch) | |
| tree | cd0cbf4d2c45d7beabc2663c00d1b00f5fc83cdc /app/views/peek | |
| parent | 7671c592f826f44be5a8a7dc947fba467f5df851 (diff) | |
Fix Peek on Puma
Peek's `Peek.request_id` method doesn't work well with a multi-threaded
server and concurrent requests, because requests can 'steal' another
request's ID, or unset it before it was due.
The upstream change resolves this; the commit here is just to ensure
that GitLab works with that upstream change, mostly by not using
`Peek.request_id` any more (as the method doesn't exist).
Diffstat (limited to 'app/views/peek')
| -rw-r--r-- | app/views/peek/_bar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/peek/_bar.html.haml b/app/views/peek/_bar.html.haml index 5228930293c..3c2c4d30535 100644 --- a/app/views/peek/_bar.html.haml +++ b/app/views/peek/_bar.html.haml @@ -1,6 +1,6 @@ - return unless peek_enabled? #js-peek{ data: { env: Peek.env, - request_id: Peek.request_id, + request_id: peek_request_id, peek_url: "#{peek_routes_path}/results" }, class: Peek.env } |