diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-11-02 04:14:22 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-11-02 04:14:22 +0300 |
commit | 06946cbec9e76398cdf2c590fd13e3f71c04595f (patch) | |
tree | 7cd4c5cd021f4368d8264aef438780c085a72a8a | |
parent | 1ac4a7fed376ba8dd1e692af0e197d55cc1cb900 (diff) | |
parent | 20b59da2ea3ae850e8b2e823013536c2c7275156 (diff) |
Merge branch 'stateful_deployments' into add-action-to-deployment
-rw-r--r-- | app/models/concerns/deployable.rb | 2 | ||||
-rw-r--r-- | app/workers/build_success_worker.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb index 64bfd98e502..d85d624fff3 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? + return unless has_environment? && !has_deployment? 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 1623d8f02b9..f3530317090 100644 --- a/app/workers/build_success_worker.rb +++ b/app/workers/build_success_worker.rb @@ -22,8 +22,6 @@ 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 |