Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 2 insertions, 8 deletions

diff --git a/lib/gitlab/marginalia.rb b/lib/gitlab/marginalia.rb
index 24e21a1d512..325a8c5c325 100644
--- a/lib/gitlab/marginalia.rb
+++ b/lib/gitlab/marginalia.rb
@@ -4,8 +4,6 @@ module Gitlab
   module Marginalia
     cattr_accessor :enabled, default: false
 
-    MARGINALIA_FEATURE_FLAG = :marginalia
-
     def self.set_application_name
       ::Marginalia.application_name = Gitlab.process_name
     end
@@ -16,15 +14,11 @@ module Gitlab
       end
     end
 
-    def self.cached_feature_enabled?
-      enabled
-    end
-
-    def self.set_feature_cache
+    def self.set_enabled_from_feature_flag
       # During db:create and db:bootstrap skip feature query as DB is not available yet.
       return false unless Gitlab::Database.cached_table_exists?('features')
 
-      self.enabled = Feature.enabled?(MARGINALIA_FEATURE_FLAG)
+      self.enabled = Feature.enabled?(:marginalia, type: :ops)
     end
   end
 end