diff options
author | Robert Speicher <robert@gitlab.com> | 2016-10-04 09:03:18 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-10-04 09:03:18 +0000 |
commit | 66613f1ac9e277da9b68ff6ddbd0fb7eca3507bf (patch) | |
tree | 1c42b8fc824e56d4832d3442c12a9815fd0ecc72 | |
parent | 77de91e1b02e48cd15a0bced8f5b92f272b82e3a (diff) | |
parent | d6e42e0ca1ab9962b7d43517c6f6beab5f1ade1c (diff) | |
download | gitlab-ce-66613f1ac9e277da9b68ff6ddbd0fb7eca3507bf.tar.gz |
Merge branch 'zj-grape-sessions' into 'master'
GrapeDSL for Namespace endpoint
No changelog item as it doesn't change behaviour
Cherry-picked from !6330
See merge request !6632
-rw-r--r-- | lib/api/namespaces.rb | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb index 50d3729449e..fe981d7b9fa 100644 --- a/lib/api/namespaces.rb +++ b/lib/api/namespaces.rb @@ -4,20 +4,18 @@ module API before { authenticate! } resource :namespaces do - # Get a namespaces list - # - # Example Request: - # GET /namespaces + desc 'Get a namespaces list' do + success Entities::Namespace + end + params do + optional :search, type: String, desc: "Search query for namespaces" + end get do - @namespaces = if current_user.admin - Namespace.all - else - current_user.namespaces - end - @namespaces = @namespaces.search(params[:search]) if params[:search].present? - @namespaces = paginate @namespaces + namespaces = current_user.admin ? Namespace.all : current_user.namespaces + + namespaces = namespaces.search(params[:search]) if params[:search].present? - present @namespaces, with: Entities::Namespace + present paginate(namespaces), with: Entities::Namespace end end end |