From 26384c9a61da9922b8fa4b8351d4e42d51661b37 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Feb 2020 09:08:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/serverless/domain_cluster.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/models/serverless/domain_cluster.rb') diff --git a/app/models/serverless/domain_cluster.rb b/app/models/serverless/domain_cluster.rb index 9a1acf7e5c3..94d90d3e305 100644 --- a/app/models/serverless/domain_cluster.rb +++ b/app/models/serverless/domain_cluster.rb @@ -10,6 +10,11 @@ module Serverless belongs_to :knative, class_name: 'Clusters::Applications::Knative', foreign_key: 'clusters_applications_knative_id' belongs_to :creator, class_name: 'User', optional: true + attr_encrypted :key, + mode: :per_attribute_iv, + key: Settings.attr_encrypted_db_key_base_truncated, + algorithm: 'aes-256-gcm' + validates :pages_domain, :knative, presence: true validates :uuid, presence: true, uniqueness: true, length: { is: Gitlab::Serverless::Domain::UUID_LENGTH }, format: { with: HEX_REGEXP, message: 'only allows hex characters' } -- cgit v1.2.1