Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index f301f206b46..12b4ef07dd6 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -29,6 +29,15 @@ class Feature
   class << self
     delegate :group, to: :flipper
 
+    def feature_flags_available?
+      # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
+      active_db_connection = ActiveRecord::Base.connection.active? rescue false # rubocop:disable Database/MultipleDatabases
+
+      active_db_connection && Feature::FlipperFeature.table_exists?
+    rescue ActiveRecord::NoDatabaseError
+      false
+    end
+
     def all
       flipper.features.to_a
     end