summaryrefslogtreecommitdiff
path: root/app/models/environment.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 18:34:48 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-14 18:34:48 +0200
commit14a02a6a95353948d00f8f973b35b80ac06f4599 (patch)
treed9dbdee6528f1dfeb7a827e95c35e707436e7d49 /app/models/environment.rb
parent006b65098806fde2a467d9a79347d2978c992e89 (diff)
downloadgitlab-ce-14a02a6a95353948d00f8f973b35b80ac06f4599.tar.gz
Improve design after review
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r--app/models/environment.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 3eab137718e..ac6f8c81e01 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -5,13 +5,12 @@ class Environment < ActiveRecord::Base
validates :name,
presence: true,
+ uniqueness: { scope: :project_id },
length: { within: 0..255 },
format: { with: Gitlab::Regex.environment_name_regex,
message: Gitlab::Regex.environment_name_regex_message }
- validates_uniqueness_of :name, scope: :project_id
-
- validates_associated :project
+ validates :project, associated: true
def last_deployment
deployments.last