diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-19 06:03:29 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-29 15:19:33 -0700 |
| commit | b5c706326ada2c0d213dd512842c5f677d9d94f9 (patch) | |
| tree | b0b23d8c5ab778d62523cc23d718bb32490543e8 /app/models/clusters | |
| parent | d3b39a835f1ef42d71ba7b478d9e7320c4167b4e (diff) | |
| download | gitlab-ce-b5c706326ada2c0d213dd512842c5f677d9d94f9.tar.gz | |
Upgrade to Ruby 2.4.4sh-bump-ruby-2.4
Fixes that make this work:
* A change in Ruby (https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1)
requires passing in the exact required length for OpenSSL keys and IVs.
* Ensure the secrets.yml is generated before any prepended modules are
loaded. This is done by renaming the `secret_token.rb` initializer to
`01_secret_token.rb`, which is a bit ugly but involves the least impact on
other files.
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, |