Merge branch 'current-settings-handle-missing-db' into 'master'
See merge request !2346
This commit is contained in:
commit
ec4a4f0623
|
@ -41,6 +41,9 @@ module Gitlab
|
||||||
use_db && ActiveRecord::Base.connection.active? &&
|
use_db && ActiveRecord::Base.connection.active? &&
|
||||||
!ActiveRecord::Migrator.needs_migration? &&
|
!ActiveRecord::Migrator.needs_migration? &&
|
||||||
ActiveRecord::Base.connection.table_exists?('application_settings')
|
ActiveRecord::Base.connection.table_exists?('application_settings')
|
||||||
|
|
||||||
|
rescue ActiveRecord::NoDatabaseError
|
||||||
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue