summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-03-03 15:01:10 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-03-03 15:01:10 +0000
commitf9aae510d9d917eda1ad3970f7989fb7d4e74f2c (patch)
tree5ee7214758a2820e5f171db369b3455704e60219 /lib/api/helpers.rb
parent433ec4d8da9d6c3b45660892a15e88a1719e7599 (diff)
parent6357635686fafb2fc9af5090c1edabfe25649085 (diff)
downloadgitlab-ce-f9aae510d9d917eda1ad3970f7989fb7d4e74f2c.tar.gz
Merge branch '28865-filter-by-authorized-projects-in-v4' into 'master'
Add filter param for user's authorized projects in V4 Closes #28865 See merge request !9674
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 4600abc7dc7..9c41146f1e3 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -252,6 +252,10 @@ module API
# project helpers
def filter_projects(projects)
+ if params[:membership]
+ projects = projects.merge(current_user.authorized_projects)
+ end
+
if params[:owned]
projects = projects.merge(current_user.owned_projects)
end