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.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.rb')
| -rw-r--r-- | railties/lib/rails/application.rb | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 1a6aed7ce4..89f7b5991f 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -4,6 +4,7 @@ require "active_support/core_ext/object/blank" require "active_support/key_generator" require "active_support/message_verifier" require "rails/engine" +require "rails/secrets" module Rails # An Engine with the responsibility of coordinating the whole boot process. @@ -385,18 +386,7 @@ module Rails def secrets @secrets ||= begin secrets = ActiveSupport::OrderedOptions.new - yaml = config.paths["config/secrets"].first - - if File.exist?(yaml) - require "erb" - - all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {} - shared_secrets = all_secrets["shared"] - env_secrets = all_secrets[Rails.env] - - secrets.merge!(shared_secrets.deep_symbolize_keys) if shared_secrets - secrets.merge!(env_secrets.deep_symbolize_keys) if env_secrets - end + secrets.merge! Rails::Secrets.parse(config.paths["config/secrets"].existent, env: Rails.env) # Fallback to config.secret_key_base if secrets.secret_key_base isn't set secrets.secret_key_base ||= config.secret_key_base |