diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2016-11-21 18:56:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-21 18:56:26 -0500 |
| commit | 6cd65861e93250159b19eac5b990a100f566e0ff (patch) | |
| tree | 30fb14995a96e55732992fbe4a0bf7eaa1bb259d /railties/lib | |
| parent | 1f2e896edb05467559b1df9653d350bda1ec75cb (diff) | |
| parent | 7102c6ce8984c82e0ea84b039f288f72c79dcf18 (diff) | |
| download | rails-6cd65861e93250159b19eac5b990a100f566e0ff.tar.gz rails-6cd65861e93250159b19eac5b990a100f566e0ff.tar.bz2 rails-6cd65861e93250159b19eac5b990a100f566e0ff.zip | |
Merge pull request #26929 from elorest/is_deep_symbolize_secrets
deep symbolize keys on secrets.yml
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 3b94ae4f82..f96432c89f 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -394,8 +394,8 @@ module Rails shared_secrets = all_secrets["shared"] env_secrets = all_secrets[Rails.env] - secrets.merge!(shared_secrets.symbolize_keys) if shared_secrets - secrets.merge!(env_secrets.symbolize_keys) if env_secrets + secrets.merge!(shared_secrets.deep_symbolize_keys) if shared_secrets + secrets.merge!(env_secrets.deep_symbolize_keys) if env_secrets end # Fallback to config.secret_key_base if secrets.secret_key_base isn't set |