diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-02-12 17:17:00 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-02-12 17:17:00 +0100 |
| commit | 37e30d2548e586a5080554a5d5065dd82289fbfe (patch) | |
| tree | df2e782599f2399d8c79d762278126a359191f91 /railties/lib | |
| parent | 8cdd93ad627dfd549312b3f4396160ed7bad4909 (diff) | |
| download | rails-37e30d2548e586a5080554a5d5065dd82289fbfe.tar.gz rails-37e30d2548e586a5080554a5d5065dd82289fbfe.tar.bz2 rails-37e30d2548e586a5080554a5d5065dd82289fbfe.zip | |
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 |