diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-19 08:52:01 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-19 08:52:01 +0000 |
commit | 1c7893c5c1bf3ee78351765c0db41c9247ec8e88 (patch) | |
tree | 2ac6bd92320798f0d93a208d5f9e8e6be7e986c1 /lib | |
parent | 1314b79d93b601f60c3032e1223cdb09e5af3a3a (diff) | |
parent | 66c7f518974cf3e3c9d9914fe7dd5b89f216889b (diff) | |
download | gitlab-ce-1c7893c5c1bf3ee78351765c0db41c9247ec8e88.tar.gz |
Merge branch 'rc/bump-peek-performance_bar' into 'master'
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch
See merge request !12939
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/performance_bar/peek_performance_bar_with_rack_body.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/gitlab/performance_bar/peek_performance_bar_with_rack_body.rb b/lib/gitlab/performance_bar/peek_performance_bar_with_rack_body.rb deleted file mode 100644 index d939a6ea18d..00000000000 --- a/lib/gitlab/performance_bar/peek_performance_bar_with_rack_body.rb +++ /dev/null @@ -1,22 +0,0 @@ -# This solves a bug with a X-Senfile header that wouldn't be set properly, see -# https://github.com/peek/peek-performance_bar/pull/27 -module Gitlab - module PerformanceBar - module PeekPerformanceBarWithRackBody - def call(env) - @env = env - reset_stats - - @total_requests += 1 - first_request if @total_requests == 1 - - env['process.request_start'] = @start.to_f - env['process.total_requests'] = total_requests - - status, headers, body = @app.call(env) - body = Rack::BodyProxy.new(body) { record_request } - [status, headers, body] - end - end - end -end |