summaryrefslogtreecommitdiff
path: root/app/models/deployment.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/deployment.rb')
-rw-r--r--app/models/deployment.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 1254ce1c90a..1ae7d9925a5 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -103,15 +103,6 @@ class Deployment < ApplicationRecord
deployment.finished_at = Time.current
end
- after_transition any => :running do |deployment|
- next unless deployment.project.ci_forward_deployment_enabled?
- next if Feature.enabled?(:prevent_outdated_deployment_jobs, deployment.project)
-
- deployment.run_after_commit do
- Deployments::DropOlderDeploymentsWorker.perform_async(id)
- end
- end
-
after_transition any => :running do |deployment, transition|
deployment.run_after_commit do
Deployments::HooksWorker.perform_async(deployment_id: id, status: transition.to, status_changed_at: Time.current)
@@ -303,7 +294,7 @@ class Deployment < ApplicationRecord
end
def older_than_last_successful_deployment?
- last_deployment_id = environment.last_deployment&.id
+ last_deployment_id = environment&.last_deployment&.id
return false unless last_deployment_id.present?
return false if self.id == last_deployment_id