Permalink
Browse files

Merge pull request #14528 from planas/patch-1

Require yaml explicitly on #database_configuration
  • Loading branch information...
2 parents 74a8217 + 7afe193 commit fd5739c94a6ee6ae137c946960fe1c7078404eb2 @rafaelfranca rafaelfranca committed Mar 30, 2014
Showing with 1 addition and 0 deletions.
  1. +1 −0 railties/lib/rails/application/configuration.rb
@@ -95,6 +95,7 @@ def database_configuration
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']

0 comments on commit fd5739c

Please sign in to comment.