diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 18:10:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-02 18:10:57 +0300 |
commit | 426384d091a0c229ff849ed6ba481bfbe700fb6a (patch) | |
tree | 2e1cc21f46ee6235984ae072d391ffb15f4a1d1c /app/services/deployments | |
parent | 2ce2a08284a698742c24d1b50fab5f77aa5c6321 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/deployments')
-rw-r--r-- | app/services/deployments/older_deployments_drop_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/deployments/older_deployments_drop_service.rb b/app/services/deployments/older_deployments_drop_service.rb index e765d2484ea..9283a5c1279 100644 --- a/app/services/deployments/older_deployments_drop_service.rb +++ b/app/services/deployments/older_deployments_drop_service.rb @@ -12,7 +12,7 @@ module Deployments return unless @deployment&.running? older_deployments.find_each do |older_deployment| - Gitlab::OptimisticLocking.retry_lock(older_deployment.deployable) do |deployable| + Gitlab::OptimisticLocking.retry_lock(older_deployment.deployable, name: 'older_deployments_drop') do |deployable| deployable.drop(:forward_deployment_failure) end rescue => e |