aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-04-01 13:22:25 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-04-16 09:35:45 +0900
commit827bfe4f41c39eade078e26ad5653979891d89c7 (patch)
tree968930eeb8c8f052b39183dabf81762c165fa776 /railties/lib/rails/application
parente7f45d370ab10ad86a748ff2ec8b34c54d87b0bf (diff)
downloadrails-827bfe4f41c39eade078e26ad5653979891d89c7.tar.gz
rails-827bfe4f41c39eade078e26ad5653979891d89c7.tar.bz2
rails-827bfe4f41c39eade078e26ad5653979891d89c7.zip
Use the config value directly when call `secrets`
Currently, `read_encrypted_secrets` is set with initializer. Therefore if refer to `secrets` in config, `read_encrypted_secrets` is false, so can not get the value of `secrets.yml.enc`. In order to be able to refer to secrets in config, modified to refer to `config.read_encrypted_secrets` when calling `secrets`. Fixes #28618.
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/bootstrap.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 4223c38146..dc0491035d 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -81,7 +81,6 @@ INFO
initializer :set_secrets_root, group: :all do
Rails::Secrets.root = root
- Rails::Secrets.read_encrypted_secrets = config.read_encrypted_secrets
end
end
end