Permalink
Browse files

Require yaml explicitly

  • Loading branch information...
1 parent 03bf81a commit 7afe193887ca08625e6952a3cc8c8bb6d6729cc3 Adrià Planas committed Mar 29, 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 7afe193

Please sign in to comment.