diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-04 08:37:53 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-04 08:37:53 +0000 |
| commit | 414daf34e988390ab118a85c536187d15e6070bc (patch) | |
| tree | 61b92b5a64b79b6c375cb16b65fd72cc9fc35dc8 /db | |
| parent | 9b20be45e99e9589626f47798e3565f102168b1f (diff) | |
| parent | ca466d5d152e1a4f35ef044f344d8b7b33617db2 (diff) | |
| download | gitlab-ce-414daf34e988390ab118a85c536187d15e6070bc.tar.gz | |
Merge branch 'sh-fix-secrets-not-working' into 'master'
Fix attr_encryption key settings
Closes #47166
See merge request gitlab-org/gitlab-ce!19341
Diffstat (limited to 'db')
| -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 |