Commit 4ed36955 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix-build' into 'master'

Ensure that is no pending migrations when using database on
Gitlab::CurrentSettings

This fixes the undefined method `recaptcha_enabled' for
#<ApplicationSetting:0x007f28552f8238> when running the build.

See merge request !2254
parents 088d833c ff98c631
......@@ -38,7 +38,9 @@ def connect_to_db?
true
end
use_db && ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
use_db && ActiveRecord::Base.connection.active? &&
!ActiveRecord::Migrator.needs_migration? &&
ActiveRecord::Base.connection.table_exists?('application_settings')
end
end
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