diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 12:08:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 12:08:50 +0000 |
| commit | 81fb153d0550c2c0b707a374cb6ee9f2ad089790 (patch) | |
| tree | 0326c005bea62adc258bb0d4d1a3a7f5fc6a9532 /app/models/deployment.rb | |
| parent | 084d7453e0866f2b29923552fb1c5f380f283ab5 (diff) | |
| download | gitlab-ce-81fb153d0550c2c0b707a374cb6ee9f2ad089790.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/deployment.rb')
| -rw-r--r-- | app/models/deployment.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index f84857d3511..3a96f4e3867 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -110,7 +110,11 @@ class Deployment < ApplicationRecord after_transition any => :running do |deployment| deployment.run_after_commit do - Deployments::HooksWorker.perform_async(deployment_id: id, status_changed_at: Time.current) + if Feature.enabled?(:deployment_hooks_skip_worker, deployment.project) + deployment.execute_hooks(Time.current) + else + Deployments::HooksWorker.perform_async(deployment_id: id, status_changed_at: Time.current) + end end end @@ -124,7 +128,11 @@ class Deployment < ApplicationRecord after_transition any => FINISHED_STATUSES do |deployment| deployment.run_after_commit do - Deployments::HooksWorker.perform_async(deployment_id: id, status_changed_at: Time.current) + if Feature.enabled?(:deployment_hooks_skip_worker, deployment.project) + deployment.execute_hooks(Time.current) + else + Deployments::HooksWorker.perform_async(deployment_id: id, status_changed_at: Time.current) + end end end |