From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 26 Feb 2013 11:41:09 +0000 (+0000)
Subject: Ruby2.0: add "require 'yaml'" to Gemfile
X-Git-Tag: 2.4.0~615
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bf917a61e7166a76fb468119b1fae3fbb2e13514;p=redmine.git

Ruby2.0: add "require 'yaml'" to Gemfile

On ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-linux]:
<pre>
$ ruby script/about
There was an error in your Gemfile, and Bundler cannot continue.
</pre>

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

diff --git a/Gemfile b/Gemfile
index 6ce41d415..8a30e19a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ end
 # Include database gems for the adapters found in the database
 # configuration file
 require 'erb'
+require 'yaml'
 database_file = File.join(File.dirname(__FILE__), "config/database.yml")
 if File.exist?(database_file)
   database_config = YAML::load(ERB.new(IO.read(database_file)).result)