From 7afe193887ca08625e6952a3cc8c8bb6d6729cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A0=20Planas?= <adriaplanas@liquidcodeworks.com>
Date: Sat, 29 Mar 2014 21:21:01 +0100
Subject: Require yaml explicitly

---
 railties/lib/rails/application/configuration.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'railties/lib/rails')

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']
-- 
cgit v1.2.3