Commit c4ef7f06a1db5f613fa9c98d114fe428767a0b50
Exists in
spb-stable
and in
3 other branches
Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup
Allow to parse heroku-generated database.yml config file.
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_file(File.join(Rails.root,'config','database.yml'))[Rails.env] | 19 | + config = YAML.load(ERB.new(File.read(File.join(Rails.root, "config","database.yml"))).result) |
| 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 |