diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-01-08 14:09:58 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-01-08 14:09:58 +0000 |
| commit | ec4a4f0623a6892daef75d4b790bc2fec5803b15 (patch) | |
| tree | cedf873c172dc2dffb1a5fb9639b8c9d6fc10538 | |
| parent | b64ec38aae3e741aacd3a136eba5ccfa8053eca2 (diff) | |
| parent | 8d7a968d6dbc70d31953bac5262c86c4ca9dc7d9 (diff) | |
| download | gitlab-ce-ec4a4f0623a6892daef75d4b790bc2fec5803b15.tar.gz | |
Merge branch 'current-settings-handle-missing-db' into 'master'
See merge request !2346
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
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 |