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

See merge request !2346
2016-01-08 14:09:58 +00:00 · 2016-01-08 14:09:58 +00:00 · ec4a4f0623
parent b64ec38aae 8d7a968d6d
commit ec4a4f0623
1 changed files with 3 additions and 0 deletions
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@ -41,6 +41,9 @@ module Gitlab
      use_db && ActiveRecord::Base.connection.active? &&
                !ActiveRecord::Migrator.needs_migration? &&
                ActiveRecord::Base.connection.table_exists?('application_settings')
+
+    rescue ActiveRecord::NoDatabaseError
+      false
    end
  end
 end