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
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-22 09:06:38 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-22 09:06:38 +0300
commitfbeeb1478c77a36c8e1f4e1e157539136e4ac4e2 (patch)
tree4f776ec7bdadf9dd80c5968eb7869d1facfd4106 /lib/feature
parentc4a5216027c1a9b65228f1d19d761ec9dce9b578 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/feature')
-rw-r--r--lib/feature/gitaly.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb
index c23d7025d0f..0ac2d017e1a 100644
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -19,7 +19,7 @@ class Feature
default_on = DEFAULT_ON_FLAGS.include?(feature_flag)
Feature.enabled?("gitaly_#{feature_flag}", default_enabled: default_on)
- rescue ActiveRecord::NoDatabaseError
+ rescue ActiveRecord::NoDatabaseError, PG::ConnectionBad
false
end