summaryrefslogtreecommitdiff
path: root/app/models/concerns/deployable.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/concerns/deployable.rb')
-rw-r--r--app/models/concerns/deployable.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb
index f4f1989f0a9..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 starts_environment? && !has_deployment?
+ return unless has_environment? && !has_deployment?
environment = project.environments.find_or_create_by(
name: expanded_environment_name
@@ -21,7 +21,8 @@ module Deployable
sha: sha,
user: user,
deployable: self,
- on_stop: on_stop).tap do |_|
+ on_stop: on_stop,
+ action: environment_action).tap do |_|
self.reload # Reload relationships
end
end