From 22fd7df02133f3a21828554965fd5619905eac2c Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 1 Nov 2018 19:33:50 +0900 Subject: [PATCH] Simplify the Deployable and BuildSuccessWorker --- app/models/concerns/deployable.rb | 2 +- app/workers/build_success_worker.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb index ba3abf28ab0..8467ccb4ec6 100644 --- a/app/models/concerns/deployable.rb +++ b/app/models/concerns/deployable.rb @@ -7,7 +7,7 @@ module Deployable after_create :create_deployment def create_deployment - return unless has_environment? && !has_deployment? + return unless has_environment? environment = project.environments.find_or_create_by( name: expanded_environment_name diff --git a/app/workers/build_success_worker.rb b/app/workers/build_success_worker.rb index f3530317090..1623d8f02b9 100644 --- a/app/workers/build_success_worker.rb +++ b/app/workers/build_success_worker.rb @@ -22,6 +22,8 @@ class BuildSuccessWorker # Therefore we no longer need to create a deployment, after a build succeeded. # We're leaving this code for the transition period, but we can remove this code in 11.6. def create_deployment(build) + return if build.has_deployment? + build.create_deployment.try do |deployment| deployment.succeed end -- GitLab