summaryrefslogtreecommitdiff
path: root/lib/api/groups.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-18 14:14:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-18 14:14:39 +0000
commit1eb82b65c554f21d83447f895a6208905fabe112 (patch)
treeab12f01b3dc46f11c02afea1e470a78f06ca70c2 /lib/api/groups.rb
parent4ab54c2233e91f60a80e5b6fa2181e6899fdcc3e (diff)
downloadgitlab-ce-stable-branch-foss-test.tar.gz
Add latest changes from gitlab-org/gitlab@12-3-auto-deploy-20190916stable-branch-foss-test
Diffstat (limited to 'lib/api/groups.rb')
-rw-r--r--lib/api/groups.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index 9d1628de7e5..4ae9b8c70d3 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -173,8 +173,7 @@ module API
options = {
with: params[:with_projects] ? Entities::GroupDetail : Entities::Group,
- current_user: current_user,
- user_can_admin_group: can?(current_user, :admin_group, group)
+ current_user: current_user
}
group, options = with_custom_attributes(group, options)