diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 14:22:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 14:22:11 +0000 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /lib/gem_extensions | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
| download | gitlab-ce-0c872e02b2c822e3397515ec324051ff540f0cd5.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'lib/gem_extensions')
| -rw-r--r-- | lib/gem_extensions/active_record/association.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |