diff options
| author | Adrià Planas <adriaplanas@liquidcodeworks.com> | 2014-03-29 21:21:01 +0100 |
|---|---|---|
| committer | Adrià Planas <adriaplanas@liquidcodeworks.com> | 2014-03-29 21:21:01 +0100 |
| commit | 7afe193887ca08625e6952a3cc8c8bb6d6729cc3 (patch) | |
| tree | c8a6dfc0a5424bf7f21fe783563ddb9ffe70cdff /railties/lib/rails/application/configuration.rb | |
| parent | 03bf81a5040f08970fc5d091af38d6e2afc7113c (diff) | |
| download | rails-7afe193887ca08625e6952a3cc8c8bb6d6729cc3.tar.gz rails-7afe193887ca08625e6952a3cc8c8bb6d6729cc3.tar.bz2 rails-7afe193887ca08625e6952a3cc8c8bb6d6729cc3.zip | |
Require yaml explicitly
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -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'] |