Merge branch 'variable-fix' into 'master'

Require the variable key to be set and unique See merge request !234
gitlabhq · Aug 19, 2015 · 1fdd1fa · 1fdd1fa
2 parents 34283ad + 85f1cd2
commit 1fdd1fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,6 +13,7 @@ v7.14.0 (unreleased)
   - Fix broken yaml error saving
   - Rename type(s) to stage(s)
   - Add missing stage when doing retry
+  - Require variable keys to be not-empty and unique
 
 v7.13.1
   - Fix: user could steal specific runner

diff --git a/app/models/variable.rb b/app/models/variable.rb
@@ -14,5 +14,8 @@
 class Variable < ActiveRecord::Base
   belongs_to :project
 
+  validates_presence_of :key
+  validates_uniqueness_of :key
+
   attr_encrypted :value, mode: :per_attribute_iv_and_salt, key: GitlabCi::Application.secrets.db_key_base
 end