1 files changed, 9 insertions, 18 deletions
diff --git a/app/models/ci/variable.rb b/app/models/ci/variable.rb
index f235260208f..452cb910bca 100644
--- a/app/models/ci/variable.rb
+++ b/app/models/ci/variable.rb
@@ -1,27 +1,18 @@
 module Ci
   class Variable < ActiveRecord::Base
-    extend Ci::Model
+    extend Gitlab::Ci::Model
+    include HasVariable
+    include Presentable
 
     belongs_to :project
 
-    validates :key,
-      presence: true,
-      uniqueness: { scope: :project_id },
-      length: { maximum: 255 },
-      format: { with: /\A[a-zA-Z0-9_]+\z/,
-                message: "can contain only letters, digits and '_'." }
+    alias_attribute :secret_value, :value
 
-    scope :order_key_asc, -> { reorder(key: :asc) }
-    scope :unprotected, -> { where(protected: false) }
-
-    attr_encrypted :value,
-       mode: :per_attribute_iv_and_salt,
-       insecure_mode: true,
-       key: Gitlab::Application.secrets.db_key_base,
-       algorithm: 'aes-256-cbc'
+    validates :key, uniqueness: {
+      scope: [:project_id, :environment_scope],
+      message: "(%{value}) has already been taken"
+    }
 
-    def to_runner_variable
-      { key: key, value: value, public: false }
-    end
+    scope :unprotected, -> { where(protected: false) }
   end
 end