diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
| commit | 8ffcaf3b85fdf716ffeacf4e9d4c89b922de50b9 (patch) | |
| tree | 2e6acfa369e3e659ef4c6afb9290ad122a8fea5c /db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb | |
| parent | 1841da16abe864b3dae19636fee9e9bbe9a01b56 (diff) | |
| parent | 23ae072ba2d601a3639a32f5a29302c430106bb8 (diff) | |
| download | gitlab-ce-11-0-stable-prepare-rc2.tar.gz | |
Merge branch 'master' into 11-0-stable-prepare-rc211-0-stable-prepare-rc2
Diffstat (limited to 'db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb')
| -rw-r--r-- | db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb b/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb index 1586a7eb92f..a957f107405 100644 --- a/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb +++ b/db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb @@ -48,7 +48,7 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati 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' end |