diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-18 15:36:58 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-18 15:36:58 +0000 |
| commit | 41ae26d9eacbe53213d0786589003b5119d383c4 (patch) | |
| tree | 962004e553a0449546e5c62884a37e9c1c9734c1 /lib | |
| parent | 5e01cf72249725cb6e0c8aa3d28325d9b4942566 (diff) | |
| parent | ab94a5a53712740df3836413bf26e4856b5f7cb2 (diff) | |
| download | gitlab-ce-41ae26d9eacbe53213d0786589003b5119d383c4.tar.gz | |
Merge branch 'api-nested-group-permission' into 'master'
Return the maximum group access level in the projects API
Closes #43684
See merge request gitlab-org/gitlab-ce!24403
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 57a48d0c0fa..97b421e8651 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -964,7 +964,7 @@ module API if options[:group_members] options[:group_members].find { |member| member.source_id == project.namespace_id } else - project.group.group_member(options[:current_user]) + project.group.highest_group_member(options[:current_user]) end end end |