diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /lib/gem_extensions | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'lib/gem_extensions')
| -rw-r--r-- | lib/gem_extensions/active_record/association.rb | 4 | ||||
| -rw-r--r-- | lib/gem_extensions/active_record/disable_joins/associations/association_scope.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gem_extensions/active_record/association.rb b/lib/gem_extensions/active_record/association.rb index 91a9f45ce7e..c6634a0524a 100644 --- a/lib/gem_extensions/active_record/association.rb +++ b/lib/gem_extensions/active_record/association.rb @@ -15,7 +15,7 @@ module GemExtensions def scope if disable_joins - DisableJoins::Associations::AssociationScope.create.scope(self) + ::GemExtensions::ActiveRecord::DisableJoins::Associations::AssociationScope.create.scope(self) else super end @@ -25,7 +25,7 @@ module GemExtensions if klass @association_scope ||= begin # rubocop:disable Gitlab/ModuleWithInstanceVariables if disable_joins - DisableJoins::Associations::AssociationScope.scope(self) + ::GemExtensions::ActiveRecord::DisableJoins::Associations::AssociationScope.scope(self) else super end diff --git a/lib/gem_extensions/active_record/disable_joins/associations/association_scope.rb b/lib/gem_extensions/active_record/disable_joins/associations/association_scope.rb index 1e4476330a2..9ff80829bc3 100644 --- a/lib/gem_extensions/active_record/disable_joins/associations/association_scope.rb +++ b/lib/gem_extensions/active_record/disable_joins/associations/association_scope.rb @@ -64,7 +64,7 @@ module GemExtensions end if scope.order_values.empty? && ordered - split_scope = DisableJoins::Relation.create(scope.klass, key, join_ids) + split_scope = ::GemExtensions::ActiveRecord::DisableJoins::Relation.create(scope.klass, key, join_ids) split_scope.where_clause += scope.where_clause split_scope else |