diff options
author | Stan Hu <stanhu@gmail.com> | 2018-06-01 17:59:04 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-06-01 17:59:04 +0000 |
commit | 81e899ea7141b34a7860f308327249784fb5d6cc (patch) | |
tree | dfb47ec0b8c866c8232b367d2d9d82a1887024bc /app/models/clusters | |
parent | 160cc6cd7b0218cdd1e210c4133fd469ffacf656 (diff) | |
parent | b5c706326ada2c0d213dd512842c5f677d9d94f9 (diff) | |
download | gitlab-ce-81e899ea7141b34a7860f308327249784fb5d6cc.tar.gz |
Merge branch 'sh-bump-ruby-2.4' into 'master'
Upgrade to Ruby 2.4.4
See merge request gitlab-org/gitlab-ce!19055
Diffstat (limited to 'app/models/clusters')
-rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 4 | ||||
-rw-r--r-- | app/models/clusters/providers/gcp.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index ba6552f238f..25eac5160f1 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: Gitlab::Application.secrets.db_key_base, + key: Settings.attr_encrypted_db_key_base, algorithm: 'aes-256-cbc' attr_encrypted :token, mode: :per_attribute_iv, - key: Gitlab::Application.secrets.db_key_base, + key: Settings.attr_encrypted_db_key_base, algorithm: 'aes-256-cbc' before_validation :enforce_namespace_to_lower_case diff --git a/app/models/clusters/providers/gcp.rb b/app/models/clusters/providers/gcp.rb index 7fac32466ab..eb2e42fd3fe 100644 --- a/app/models/clusters/providers/gcp.rb +++ b/app/models/clusters/providers/gcp.rb @@ -11,7 +11,7 @@ module Clusters attr_encrypted :access_token, mode: :per_attribute_iv, - key: Gitlab::Application.secrets.db_key_base, + key: Settings.attr_encrypted_db_key_base, algorithm: 'aes-256-cbc' validates :gcp_project_id, |