From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 19 Aug 2011 10:18:49 +0000 (+0000)
Subject: Ruby 1.9: force use syck yaml library (#8847, #4050).
X-Git-Tag: 1.3.0~1499
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3c9e99b804e76a5f27ddaa3c4033095ca60c67fc;p=redmine.git

Ruby 1.9: force use syck yaml library (#8847, #4050).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6462 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/config/boot.rb b/config/boot.rb
index 95bd6b885..12bee3d13 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,6 +1,11 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
+if RUBY_VERSION >= '1.9'
+  require 'yaml'
+  YAML::ENGINE.yamler = 'syck'
+end
+
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails