diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-08 09:30:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-08 09:30:08 +0300 |
| commit | c4ef7f06a1db5f613fa9c98d114fe428767a0b50 (patch) | |
| tree | 40b01dada19cbb875720f64715836acfa7ec711c /lib | |
| parent | d238a21bcb44d2f0fc7f027ccc19c613050f77e8 (diff) | |
| parent | 8a56e7db485d3109f3b2f02896c1165c33ffa8fb (diff) | |
| download | gitlab-ce-c4ef7f06a1db5f613fa9c98d114fe428767a0b50.tar.gz | |
Merge pull request #6717 from pkgr/fix-database-parsing-gitlab-setup
Allow to parse heroku-generated database.yml config file.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/gitlab/setup.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 853994dd67d..f988479f574 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_file(File.join(Rails.root,'config','database.yml'))[Rails.env] + config = YAML.load(ERB.new(File.read(File.join(Rails.root, "config","database.yml"))).result) success = case config["adapter"] when /^mysql/ then Rake::Task["add_limits_mysql"].invoke |