Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-09 18:07:45 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-09 18:07:45 +0300
commitf1a40d0db939dfe8ff95d385e652ff72566be765 (patch)
treecdca36cb171cdffff2739c37c23e74914e57a836 /lib/gitlab/request_profiler
parentac1dca43baa7b3b1ac7d60d89ad60fdeefed0b80 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/request_profiler')
-rw-r--r--lib/gitlab/request_profiler/middleware.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/request_profiler/middleware.rb b/lib/gitlab/request_profiler/middleware.rb
index 99958d7a211..7050aee3847 100644
--- a/lib/gitlab/request_profiler/middleware.rb
+++ b/lib/gitlab/request_profiler/middleware.rb
@@ -51,7 +51,7 @@ module Gitlab
def call_with_call_stack_profiling(env)
ret = nil
report = RubyProf::Profile.profile do
- ret = catch(:warden) do
+ ret = catch(:warden) do # rubocop:disable Cop/BanCatchThrow
@app.call(env)
end
end
@@ -67,7 +67,7 @@ module Gitlab
def call_with_memory_profiling(env)
ret = nil
report = MemoryProfiler.report do
- ret = catch(:warden) do
+ ret = catch(:warden) do # rubocop:disable Cop/BanCatchThrow
@app.call(env)
end
end
@@ -99,7 +99,7 @@ module Gitlab
if ret.is_a?(Array)
ret
else
- throw(:warden, ret)
+ throw(:warden, ret) # rubocop:disable Cop/BanCatchThrow
end
end
end