diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-23 19:22:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 19:22:55 +0100 |
| commit | 8f59a1dd878f56798f88369fa5b448f17a29679d (patch) | |
| tree | 5ba674c73ffb5e2f246e7a2d0a8db579733d37f5 /railties/lib/rails/application/bootstrap.rb | |
| parent | 4734d23c74fb4193aafe7cb04256bb745680d97f (diff) | |
| parent | 9fdf326a5f6f7e10594dd6205cfc8e0425fb3e67 (diff) | |
| download | rails-8f59a1dd878f56798f88369fa5b448f17a29679d.tar.gz rails-8f59a1dd878f56798f88369fa5b448f17a29679d.tar.bz2 rails-8f59a1dd878f56798f88369fa5b448f17a29679d.zip | |
Merge pull request #28128 from rails/revert-28127-revert-28038-encrypted-secrets
Revert "Revert "Add encrypted secrets""
Diffstat (limited to 'railties/lib/rails/application/bootstrap.rb')
| -rw-r--r-- | railties/lib/rails/application/bootstrap.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb index 6102af3fff..4223c38146 100644 --- a/railties/lib/rails/application/bootstrap.rb +++ b/railties/lib/rails/application/bootstrap.rb @@ -2,6 +2,7 @@ require "fileutils" require "active_support/notifications" require "active_support/dependencies" require "active_support/descendants_tracker" +require "rails/secrets" module Rails class Application @@ -77,6 +78,11 @@ INFO initializer :bootstrap_hook, group: :all do |app| ActiveSupport.run_load_hooks(:before_initialize, app) end + + initializer :set_secrets_root, group: :all do + Rails::Secrets.root = root + Rails::Secrets.read_encrypted_secrets = config.read_encrypted_secrets + end end end end |