diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-30 11:40:13 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-03-30 11:40:13 -0500 |
| commit | fd5739c94a6ee6ae137c946960fe1c7078404eb2 (patch) | |
| tree | 242b24be0dfd110dd2532f07d1020164982b82e3 /railties | |
| parent | 74a821760cc5c78d9932bbb1f15ba9cfba89b28d (diff) | |
| parent | 7afe193887ca08625e6952a3cc8c8bb6d6729cc3 (diff) | |
| download | rails-fd5739c94a6ee6ae137c946960fe1c7078404eb2.tar.gz rails-fd5739c94a6ee6ae137c946960fe1c7078404eb2.tar.bz2 rails-fd5739c94a6ee6ae137c946960fe1c7078404eb2.zip | |
Merge pull request #14528 from planas/patch-1
Require yaml explicitly on #database_configuration
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 9aec2f9734..4c449d2c57 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -95,6 +95,7 @@ module Rails yaml = Pathname.new(paths["config/database"].first || "") config = if yaml.exist? + require "yaml" require "erb" YAML.load(ERB.new(yaml.read).result) || {} elsif ENV['DATABASE_URL'] |