Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-23 00:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-23 00:09:53 +0300
commitd6d1051383d42211e5f4d2752d60f946f21df1b7 (patch)
treee9f8a0c60c17ebc26a96e5349656d12d9aeb2a7f /app/models/serverless
parent0a5e00b6914944295b31ce10ffd5429cbe9fae89 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/serverless')
-rw-r--r--app/models/serverless/domain_cluster.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/serverless/domain_cluster.rb b/app/models/serverless/domain_cluster.rb
index 9f914d5c3f8..0d54a97370e 100644
--- a/app/models/serverless/domain_cluster.rb
+++ b/app/models/serverless/domain_cluster.rb
@@ -12,7 +12,7 @@ module Serverless
attr_encrypted :key,
mode: :per_attribute_iv,
- key: Settings.attr_encrypted_db_key_base_truncated,
+ key: Settings.attr_encrypted_db_key_base_32,
algorithm: 'aes-256-gcm'
validates :pages_domain, :knative, presence: true