BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit ec4a4f06 by Yorick Peterse
Options

Merge branch 'current-settings-handle-missing-db' into 'master'

See merge request !2346
parents b64ec38a 8d7a968d
Showing with 3 additions and 0 deletions
lib/gitlab/current_settings.rb
...@@ -41,6 +41,9 @@ module Gitlab ...@@ -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
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