summaryrefslogtreecommitdiff
path: root/lib/api/helpers.rb
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-02-01 11:23:57 +0100
committerToon Claes <toon@gitlab.com>2017-02-14 16:41:57 +0100
commit4e9e29d295fe2f8cd258cde4b65e244eb74a1ae6 (patch)
treea1112a9839019fd0c667d19d995474bae1ed8a17 /lib/api/helpers.rb
parent9a0c1ffabcfc9d29e8cccd8d1e2162d6abbf9277 (diff)
downloadgitlab-ce-4e9e29d295fe2f8cd258cde4b65e244eb74a1ae6.tar.gz
API: Consolidate /projects endpoint
It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index dfab60f7fa5..13896dd91b9 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -256,6 +256,14 @@ module API
# project helpers
def filter_projects(projects)
+ if params[:owned]
+ projects = projects.merge(current_user.owned_projects)
+ end
+
+ if params[:starred]
+ projects = projects.merge(current_user.starred_projects)
+ end
+
if params[:search].present?
projects = projects.search(params[:search])
end