summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-24 15:57:56 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-24 15:57:56 +0100
commit8e746daad538cc456fdf618a4d6a639c5f64b174 (patch)
tree00c3d7e9698256630bb73ea291ca382752105381
parent2953e0d19b46a937ee9d84139adbc263c8e89757 (diff)
downloadgitlab-ce-api-groups.tar.gz
Return all authorized groups in API.api-groups
-rw-r--r--CHANGELOG1
-rw-r--r--lib/api/groups.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 25936eb1e1d..643a882bd2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 7.10.0 (unreleased)
- Replace commits calendar with faster contribution calendar that includes issues and merge requests
- Add inifinite scroll to user page activity
- Don't show commit comment button when user is not signed in.
+ - Return all authorized groups in API.
v 7.9.0
- Send EmailsOnPush email when branch or tag is created or deleted.
diff --git a/lib/api/groups.rb b/lib/api/groups.rb
index a92abd4b690..4aeb6069899 100644
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -12,7 +12,7 @@ module API
@groups = if current_user.admin
Group.all
else
- current_user.groups
+ current_user.authorized_groups
end
@groups = @groups.search(params[:search]) if params[:search].present?