summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-26 11:40:58 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-26 11:40:58 +0000
commit2ffbfacf5f8bda48eb761c33577f164706a6e3f3 (patch)
tree79cbb8c915c076e16c5550bdf47fc5a1c61d1798 /Gemfile
parent3f67ec44361da3cce0b30e88e1b62dcc58ddcc6c (diff)
downloadredmine-2ffbfacf5f8bda48eb761c33577f164706a6e3f3.tar.gz
redmine-2ffbfacf5f8bda48eb761c33577f164706a6e3f3.zip
back out r11486
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11487 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 1 insertions, 2 deletions
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)