diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-13 09:38:01 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-13 09:38:01 -0500 |
| commit | 6a1b459ea13ec7854ed513618ec3e75b20d7e2b9 (patch) | |
| tree | 52ec62ca83b252cf2179621818254e43df9414d0 /railties/lib | |
| parent | 6e61da2dabc30c78de7f5ba8f53f534ced463fb3 (diff) | |
| parent | 37e30d2548e586a5080554a5d5065dd82289fbfe (diff) | |
| download | rails-6a1b459ea13ec7854ed513618ec3e75b20d7e2b9.tar.gz rails-6a1b459ea13ec7854ed513618ec3e75b20d7e2b9.tar.bz2 rails-6a1b459ea13ec7854ed513618ec3e75b20d7e2b9.zip | |
Merge pull request #14029 from senny/dont_crash_on_empty_secrets_yml
do not crash when `config/secrets.yml` is blank.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 36432e56ba..314a789b96 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -308,7 +308,8 @@ module Rails yaml = config.paths["config/secrets"].first if File.exist?(yaml) require "erb" - env_secrets = YAML.load(ERB.new(IO.read(yaml)).result)[Rails.env] + all_secrets = YAML.load(ERB.new(IO.read(yaml)).result) || {} + env_secrets = all_secrets[Rails.env] secrets.merge!(env_secrets.symbolize_keys) if env_secrets end |