summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/deployment.rb2
-rw-r--r--app/models/environment.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 7cdfc740441..44a0a7fdd10 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -8,6 +8,8 @@ class Deployment < ActiveRecord::Base
validates_presence_of :sha
validates_presence_of :ref
+ validates_associated :project
+ validates_associated :environment
delegate :name, to: :environment, prefix: true
diff --git a/app/models/environment.rb b/app/models/environment.rb
index b29cca8fbe2..3eab137718e 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -9,6 +9,10 @@ class Environment < ActiveRecord::Base
format: { with: Gitlab::Regex.environment_name_regex,
message: Gitlab::Regex.environment_name_regex_message }
+ validates_uniqueness_of :name, scope: :project_id
+
+ validates_associated :project
+
def last_deployment
deployments.last
end