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>2021-04-26 15:09:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-26 15:09:44 +0300
commite5e0589e097991ca671a348de81331240e85719d (patch)
tree0767e6d3388f6ebf65f5d47a3ecb0d52430fa7da /lib/api/helpers.rb
parent0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 92018adadb1..12edb77d46f 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -318,7 +318,7 @@ module API
def verify_workhorse_api!
Gitlab::Workhorse.verify_api_request!(request.headers)
- rescue => e
+ rescue StandardError => e
Gitlab::ErrorTracking.track_exception(e)
forbidden!
@@ -559,7 +559,7 @@ module API
return unless Feature.enabled?(feature_name)
Gitlab::UsageDataCounters.count(event_name)
- rescue => error
+ rescue StandardError => error
Gitlab::AppLogger.warn("Redis tracking event failed for event: #{event_name}, message: #{error.message}")
end
@@ -569,7 +569,7 @@ module API
return unless values.present?
Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: values)
- rescue => error
+ rescue StandardError => error
Gitlab::AppLogger.warn("Redis tracking event failed for event: #{event_name}, message: #{error.message}")
end