diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-04 11:00:00 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-04 11:00:00 +0000 |
commit | b7244e038139a5c5d6107a776a096a558a403573 (patch) | |
tree | e0d522f65d405736855731a0c4770ca85a2be4d6 /app/models/clusters/platforms/kubernetes.rb | |
parent | 8008442829ea797b822d7c782334f6b2d319ca86 (diff) | |
parent | 0b4f9ff4068af6776b495d9332aeecf58e48786f (diff) | |
download | gitlab-ce-dm-gitlab-shell-7-1-4.tar.gz |
Merge branch 'master' into 'dm-gitlab-shell-7-1-4'dm-gitlab-shell-7-1-4
# Conflicts:
# GITLAB_SHELL_VERSION
Diffstat (limited to 'app/models/clusters/platforms/kubernetes.rb')
-rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 25eac5160f1..36631d57ad1 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -11,12 +11,12 @@ module Clusters attr_encrypted :password, mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base, + key: Settings.attr_encrypted_db_key_base_truncated, algorithm: 'aes-256-cbc' attr_encrypted :token, mode: :per_attribute_iv, - key: Settings.attr_encrypted_db_key_base, + key: Settings.attr_encrypted_db_key_base_truncated, algorithm: 'aes-256-cbc' before_validation :enforce_namespace_to_lower_case |