diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-13 15:07:43 +0000 |
| commit | 7eca3f56625526ffa7f263c1fef0fcea34de8ca6 (patch) | |
| tree | fec87c2a902e3c44f89963f4b28e6de32c0806f3 /app/services | |
| parent | 988424215cf104d9ee24bb1751141424cffb32d1 (diff) | |
| download | gitlab-ce-7eca3f56625526ffa7f263c1fef0fcea34de8ca6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/job_artifacts/create_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/job_artifacts/create_service.rb b/app/services/ci/job_artifacts/create_service.rb index 7c67a2e175d..635111130d6 100644 --- a/app/services/ci/job_artifacts/create_service.rb +++ b/app/services/ci/job_artifacts/create_service.rb @@ -133,7 +133,7 @@ module Ci job.update_column(:artifacts_expire_at, artifact.expire_at) end - success + success(artifact: artifact) rescue ActiveRecord::RecordNotUnique => error track_exception(error, params) error('another artifact of the same type already exists', :bad_request) |