Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 0 insertions, 9 deletions

diff --git a/lib/gitlab/marginalia.rb b/lib/gitlab/marginalia.rb
index 325a8c5c325..c99cf113638 100644
--- a/lib/gitlab/marginalia.rb
+++ b/lib/gitlab/marginalia.rb
@@ -2,8 +2,6 @@
 
 module Gitlab
   module Marginalia
-    cattr_accessor :enabled, default: false
-
     def self.set_application_name
       ::Marginalia.application_name = Gitlab.process_name
     end
@@ -13,12 +11,5 @@ module Gitlab
         ::Marginalia::SidekiqInstrumentation.enable!
       end
     end
-
-    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, type: :ops)
-    end
   end
 end