diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-06-02 05:15:53 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-02 05:15:53 +0300 |
| commit | b02b2602c1bcfd60b760fbfd1aca936475d78474 (patch) | |
| tree | 09d906b8d6fafcae31994cf0c2af6af2af6970fd /app/models/clusters/platforms/kubernetes.rb | |
| parent | c89e57842ebf7f395363bcddaeff76bc7b3f7890 (diff) | |
| parent | fe0ebf76c49e2512b211c5d43152275c536f7e3a (diff) | |
Merge branch 'master' into per-project-pipeline-iid
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 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 |