summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-19 10:18:49 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-19 10:18:49 +0000
commit3c9e99b804e76a5f27ddaa3c4033095ca60c67fc (patch)
tree6ec0e53b02202dbb8432441872c0a69f9565d958
parentbbb6048f659825b3e7bf9baa03ec11425a5cdb34 (diff)
downloadredmine-3c9e99b804e76a5f27ddaa3c4033095ca60c67fc.tar.gz
redmine-3c9e99b804e76a5f27ddaa3c4033095ca60c67fc.zip
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
-rw-r--r--config/boot.rb5
1 files changed, 5 insertions, 0 deletions
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