Commit c4dfe984 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'da-fix-issue-2603' into 'master'

Check if database_geo.yml exist before setting the tracking DB config

Closes #2603

See merge request !2071
parents cdf212d5 6beb68fa
if Gitlab::Geo.secondary_role_enabled?
if File.exist?(Rails.root.join('config/database_geo.yml')) &&
Gitlab::Geo.secondary_role_enabled?
Rails.application.configure do
config.geo_database = config_for(:database_geo)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment