summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-11-02 15:44:10 +0900
committerShinya Maeda <shinya@gitlab.com>2018-11-02 15:44:10 +0900
commit5ef309ab8863b98d39ab2471a7a1985d4ac0696b (patch)
tree89908d376931194771b24d8b57d8b40e2253af27 /app/models
parentb5e0527c5d4fe8f18b2fdda5916bae9b8cd859a4 (diff)
downloadgitlab-ce-add-action-to-deployment-backup.tar.gz
Add action to deploymentadd-action-to-deployment-backup
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/deployable.rb3
-rw-r--r--app/models/deployment.rb6
2 files changed, 8 insertions, 1 deletions
diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb
index ba3abf28ab0..d85d624fff3 100644
--- a/app/models/concerns/deployable.rb
+++ b/app/models/concerns/deployable.rb
@@ -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
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index eecb927ad01..9cea601f4bf 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -47,6 +47,12 @@ class Deployment < ActiveRecord::Base
end
end
+ enum_with_nil action: {
+ unknown_action: nil,
+ start: 1,
+ stop: 2
+ }
+
enum status: {
created: 0,
running: 1,