1 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/background_migration/user_mentions/models/namespace.rb b/lib/gitlab/background_migration/user_mentions/models/namespace.rb
index 8fa0db5fd4b..a2b50c41f4a 100644
--- a/lib/gitlab/background_migration/user_mentions/models/namespace.rb
+++ b/lib/gitlab/background_migration/user_mentions/models/namespace.rb
@@ -5,9 +5,11 @@ module Gitlab
     module UserMentions
       module Models
         # isolated Namespace model
-        class Namespace < ApplicationRecord
-          include FeatureGate
-          include ::Gitlab::VisibilityLevel
+        class Namespace < ActiveRecord::Base
+          self.inheritance_column = :_type_disabled
+
+          include Concerns::IsolatedFeatureGate
+          include Gitlab::BackgroundMigration::UserMentions::Lib::Gitlab::IsolatedVisibilityLevel
           include ::Gitlab::Utils::StrongMemoize
           include Gitlab::BackgroundMigration::UserMentions::Models::Concerns::Namespace::RecursiveTraversal
 
@@ -21,8 +23,13 @@ module Gitlab
             parent_id.present? || parent.present?
           end
 
+          # Deprecated, use #licensed_feature_available? instead. Remove once Namespace#feature_available? isn't used anymore.
+          def feature_available?(feature)
+            licensed_feature_available?(feature)
+          end
+
           # Overridden in EE::Namespace
-          def feature_available?(_feature)
+          def licensed_feature_available?(_feature)
             false
           end
         end