From 3fe2804cc2dd76f65630e7f8c9afb0c52b53aa09 Mon Sep 17 00:00:00 2001 From: John Cai Date: Wed, 27 Feb 2019 12:03:23 -0800 Subject: [PATCH 1/2] Add feature flag for FindAllTags --- lib/gitlab/gitaly_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 869b835b61e..e266dfceab9 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -228,7 +228,7 @@ module Gitlab result end - SERVER_FEATURE_FLAGS = %w[].freeze + SERVER_FEATURE_FLAGS = %w[go-find-all-tags].freeze def self.server_feature_flags SERVER_FEATURE_FLAGS.map do |f| From 3a30dffd3e1753aadab0b451fb50ec7ef5cebc53 Mon Sep 17 00:00:00 2001 From: John Cai Date: Tue, 5 Mar 2019 09:09:48 -0800 Subject: [PATCH 2/2] Check that feature database and table exists for gitaly features --- lib/gitlab/gitaly_client.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index e266dfceab9..7d60e934667 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -244,7 +244,9 @@ module Gitlab end def self.feature_enabled?(feature_name) - Feature.enabled?("gitaly_#{feature_name}") + Feature::FlipperFeature.table_exists? && Feature.enabled?("gitaly_#{feature_name}") + rescue ActiveRecord::NoDatabaseError + false end # Ensures that Gitaly is not being abuse through n+1 misuse etc