Resume unscoped user's authorized groups query

4f19e4b6 · Alex Pooley · cf36f02d · 4f19e4b6
Commit 4f19e4b6 authored Nov 11, 2020 by Alex Pooley
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

app/models/user.rb app/models/user.rb +6 -4

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -908,10 +908,12 @@ class User < ApplicationRecord
  # Returns the groups a user has access to, either through a membership or a project authorization
  def authorized_groups
-    if Feature.enabled?(:shared_group_membership_auth, self)
+    Group.unscoped do
-      authorized_groups_with_shared_membership
+      if Feature.enabled?(:shared_group_membership_auth, self)
-    else
+        authorized_groups_with_shared_membership
-      authorized_groups_without_shared_membership
+      else
+        authorized_groups_without_shared_membership
+      end
    end
  end