Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/utils/delegator_override/validator.rb b/lib/gitlab/utils/delegator_override/validator.rb
index 402154b41c2..4449fa75877 100644
--- a/lib/gitlab/utils/delegator_override/validator.rb
+++ b/lib/gitlab/utils/delegator_override/validator.rb
@@ -28,7 +28,13 @@ module Gitlab
         end
 
         def add_target(target_class)
-          @target_classes << target_class if target_class
+          return unless target_class
+
+          @target_classes << target_class
+
+          # Also include all descendants inheriting from the target,
+          # to make sure we catch methods that are only defined in some of them.
+          @target_classes += target_class.descendants
         end
 
         # This will make sure allowlist we put into ancestors are all included