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 /config | |
| 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 'config')
| -rw-r--r-- | config/initializers/01_secret_token.rb (renamed from config/initializers/secret_token.rb) | 3 | ||||
| -rw-r--r-- | config/settings.rb | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/initializers/secret_token.rb b/config/initializers/01_secret_token.rb index 750a5b34f3b..02bded43083 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/01_secret_token.rb @@ -1,3 +1,6 @@ +# This file needs to be loaded BEFORE any initializers that attempt to +# prepend modules that require access to secrets (e.g. EE's 0_as_concern.rb). +# # Be sure to restart your server when you modify this file. require 'securerandom' diff --git a/config/settings.rb b/config/settings.rb index 69d637761ea..4aa903109ea 100644 --- a/config/settings.rb +++ b/config/settings.rb @@ -85,6 +85,10 @@ class Settings < Settingslogic File.expand_path(path, Rails.root) end + def attr_encrypted_db_key_base + Gitlab::Application.secrets.db_key_base[0..31] + end + private def base_url(config) |