From 0c872e02b2c822e3397515ec324051ff540f0cd5 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 20 Dec 2022 14:22:11 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-7-stable-ee

---
 lib/gem_extensions/active_record/association.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/gem_extensions')

diff --git a/lib/gem_extensions/active_record/association.rb b/lib/gem_extensions/active_record/association.rb
index c6634a0524a..0969b803ca4 100644
--- a/lib/gem_extensions/active_record/association.rb
+++ b/lib/gem_extensions/active_record/association.rb
@@ -23,13 +23,12 @@ module GemExtensions
 
       def association_scope
         if klass
-          @association_scope ||= begin # rubocop:disable Gitlab/ModuleWithInstanceVariables
+          @association_scope ||= # rubocop:disable Gitlab/ModuleWithInstanceVariables
             if disable_joins
               ::GemExtensions::ActiveRecord::DisableJoins::Associations::AssociationScope.scope(self)
             else
               super
             end
-          end
         end
       end
     end
-- 
cgit v1.2.1