From 3c3ae74d99386614e0541bd7ee2bc24d6b2810a1 Mon Sep 17 00:00:00 2001
From: YOSHIDA Hiroki <hyoshida@appirits.com>
Date: Fri, 31 May 2013 17:43:11 +0900
Subject: [PATCH] =?utf8?q?YAML=E3=81=AE=E3=83=91=E3=83=BC=E3=82=B9?=
 =?utf8?q?=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E4=BE=8B=E5=A4=96=E3=81=8C?=
 =?utf8?q?=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/boot.rb        | 3 ---
 config/environment.rb | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/boot.rb b/config/boot.rb
index 0fddc9f..8ec392c 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,9 +1,6 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-require 'yaml'
-YAML::ENGINE.yamler = 'syck'
-
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails
diff --git a/config/environment.rb b/config/environment.rb
index 9faff2c..34e0fab 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -85,3 +85,8 @@ end
 require "#{RAILS_ROOT}/lib/jpmobile/mobile/smartphone.rb"
 carriers = Jpmobile::Mobile.carriers
 Jpmobile::Mobile.carriers = carriers.push("Smartphone")
+
+# HACK: Ruby1.9のデフォルトパーサpsychだと各所が動かなくなるので
+#       古いsyckを使うようにする (quick and dirty)
+require 'yaml'
+YAML::ENGINE.yamler = 'syck'
-- 
2.11.0