From 8d901b905c33c22c745fa72fa81e3bd35e56dce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 29 Mar 2015 23:57:49 -0300
Subject: Require yaml before trying to rescue its exception class

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

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 3e3ef72742..a65f8f2ad9 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'yaml'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/blank'
 require 'active_support/key_generator'
@@ -228,7 +229,6 @@ module Rails
       yaml = Pathname.new("#{paths["config"].existent.first}/#{name}.yml")
 
       if yaml.exist?
-        require "yaml"
         require "erb"
         (YAML.load(ERB.new(yaml.read).result) || {})[Rails.env] || {}
       else
-- 
cgit v1.2.3