1 files changed, 19 insertions, 0 deletions
diff --git a/gems/activerecord-gitlab/lib/active_record/gitlab_patches/partitioning/reflection/macro_reflection.rb b/gems/activerecord-gitlab/lib/active_record/gitlab_patches/partitioning/reflection/macro_reflection.rb
new file mode 100644
index 00000000000..7ec7da44253
--- /dev/null
+++ b/gems/activerecord-gitlab/lib/active_record/gitlab_patches/partitioning/reflection/macro_reflection.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module GitlabPatches
+    module Partitioning
+      module Reflection
+        module MacroReflection
+          def scope_for(relation, owner = nil)
+            if scope.arity == 1 && owner.nil? && options.key?(:partition_foreign_key)
+              relation
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end