Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/gem_extensions/active_record/associations/has_one_through_association.rb b/lib/gem_extensions/active_record/associations/has_one_through_association.rb
new file mode 100644
index 00000000000..1487392a4ea
--- /dev/null
+++ b/lib/gem_extensions/active_record/associations/has_one_through_association.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module GemExtensions
+  module ActiveRecord
+    module Associations
+      module HasOneThroughAssociation
+        extend ActiveSupport::Concern
+
+        def find_target
+          return scope.first if disable_joins
+
+          super
+        end
+      end
+    end
+  end
+end