Commit 665a69941bed38139c38d1142e7dec2c6cd1b517
1 parent
5ea31c7f
Exists in
spb-stable
and in
3 other branches
Revert "Allow to parse heroku-generated database.yml config file."
This reverts commit 8a56e7db485d3109f3b2f02896c1165c33ffa8fb. Because it actually breaks db setup for mysql
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/tasks/gitlab/setup.rake
| @@ -16,7 +16,7 @@ namespace :gitlab do | @@ -16,7 +16,7 @@ namespace :gitlab do | ||
| 16 | 16 | ||
| 17 | Rake::Task["db:setup"].invoke | 17 | Rake::Task["db:setup"].invoke |
| 18 | 18 | ||
| 19 | - config = YAML.load(ERB.new(File.read(File.join(Rails.root, "config","database.yml"))).result) | 19 | + config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env] |
| 20 | success = case config["adapter"] | 20 | success = case config["adapter"] |
| 21 | when /^mysql/ then | 21 | when /^mysql/ then |
| 22 | Rake::Task["add_limits_mysql"].invoke | 22 | Rake::Task["add_limits_mysql"].invoke |