Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 15:05:57 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-08 15:05:57 +0400
commit665a69941bed38139c38d1142e7dec2c6cd1b517 (patch)
tree4e4878bbb6d0d06bf4f095132103ddba1f476660
parent5ea31c7f74c816a1ea53839bc828360e7d57abf8 (diff)
Revert "Allow to parse heroku-generated database.yml config file."
This reverts commit 8a56e7db485d3109f3b2f02896c1165c33ffa8fb. Because it actually breaks db setup for mysql
-rw-r--r--lib/tasks/gitlab/setup.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index f988479f574..853994dd67d 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -16,7 +16,7 @@ namespace :gitlab do
Rake::Task["db:setup"].invoke
- config = YAML.load(ERB.new(File.read(File.join(Rails.root, "config","database.yml"))).result)
+ config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
success = case config["adapter"]
when /^mysql/ then
Rake::Task["add_limits_mysql"].invoke