Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-08 16:31:39 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2016-01-08 16:31:39 +0300
commit8d7a968d6dbc70d31953bac5262c86c4ca9dc7d9 (patch)
tree4950a0162fefed74561f74348d093c1e37be4bb3 /lib
parent61561a9eeb1dbb8273a1e8c8a5f37c0c01917c99 (diff)
Handle missing DBs in connect_to_db?
This ensures CurrentSettings#connect_to_db? returns "false" in the event of a database not existing, instead of raising an error.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/current_settings.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 7a86c09158e..7f938780ab1 100644
--- 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