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 /app/services/ci/archive_trace_service.rb
parent0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci/archive_trace_service.rb')
-rw-r--r--app/services/ci/archive_trace_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/archive_trace_service.rb b/app/services/ci/archive_trace_service.rb
index 9b2c7788897..bc3219fbd79 100644
--- a/app/services/ci/archive_trace_service.rb
+++ b/app/services/ci/archive_trace_service.rb
@@ -24,7 +24,7 @@ module Ci
end
rescue ::Gitlab::Ci::Trace::AlreadyArchivedError
# It's already archived, thus we can safely ignore this exception.
- rescue => e
+ rescue StandardError => e
# Tracks this error with application logs, Sentry, and Prometheus.
# If `archive!` keeps failing for over a week, that could incur data loss.
# (See more https://docs.gitlab.com/ee/administration/job_logs.html#new-incremental-logging-architecture)