Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/utils/delegator_override/validator.rb b/lib/gitlab/utils/delegator_override/validator.rb
index 4449fa75877..7fa5cc4deef 100644
--- a/lib/gitlab/utils/delegator_override/validator.rb
+++ b/lib/gitlab/utils/delegator_override/validator.rb
@@ -67,7 +67,7 @@ module Gitlab
 
           (delegator_class.instance_methods - allowlist).each do |method_name|
             target_classes.each do |target_class|
-              next unless target_class.instance_methods.include?(method_name)
+              next unless target_class.method_defined?(method_name)
 
               errors << generate_error(method_name, target_class, delegator_class)
             end
diff --git a/lib/gitlab/utils/override.rb b/lib/gitlab/utils/override.rb
index 39670a835a6..f83ebba7c3f 100644
--- a/lib/gitlab/utils/override.rb
+++ b/lib/gitlab/utils/override.rb
@@ -67,8 +67,8 @@ module Gitlab
         private
 
         def instance_method_defined?(klass, name)
-          klass.instance_methods(false).include?(name) ||
-            klass.private_instance_methods(false).include?(name)
+          klass.method_defined?(name, false) ||
+            klass.private_method_defined?(name, false)
         end
 
         def find_direct_method(klass, name)