From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 26 Feb 2013 11:40:58 +0000 (+0000)
Subject: back out r11486
X-Git-Tag: 2.4.0~616
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2ffbfacf5f8bda48eb761c33577f164706a6e3f3;p=redmine.git

back out r11486

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

diff --git a/Gemfile b/Gemfile
index 999b86b15..6ce41d415 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem 'rails', '3.2.12'
 gem "jquery-rails", "~> 2.0.2"
@@ -37,7 +37,6 @@ 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)