Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4f19e4b6
Commit
4f19e4b6
authored
Nov 11, 2020
by
Alex Pooley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resume unscoped user's authorized groups query
parent
cf36f02d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
app/models/user.rb
app/models/user.rb
+6
-4
No files found.
app/models/user.rb
View file @
4f19e4b6
...
@@ -908,12 +908,14 @@ class User < ApplicationRecord
...
@@ -908,12 +908,14 @@ class User < ApplicationRecord
# Returns the groups a user has access to, either through a membership or a project authorization
# Returns the groups a user has access to, either through a membership or a project authorization
def
authorized_groups
def
authorized_groups
Group
.
unscoped
do
if
Feature
.
enabled?
(
:shared_group_membership_auth
,
self
)
if
Feature
.
enabled?
(
:shared_group_membership_auth
,
self
)
authorized_groups_with_shared_membership
authorized_groups_with_shared_membership
else
else
authorized_groups_without_shared_membership
authorized_groups_without_shared_membership
end
end
end
end
end
# Returns the groups a user is a member of, either directly or through a parent group
# Returns the groups a user is a member of, either directly or through a parent group
def
membership_groups
def
membership_groups
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment