diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-04 18:00:10 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-04 18:00:10 +0200 |
| commit | 8b089fa27e14100e1c4adbfa068b2bea05f9c65f (patch) | |
| tree | 0585cc409c8beaf2cf6aebd75314c5ad6fbd12b5 /lib/api | |
| parent | 8645a0d39efb9ab616f65f63c08a60f703c12659 (diff) | |
| parent | b9219469f759f387a35bec39c3dc59477793ef1b (diff) | |
| download | gitlab-ce-8b089fa27e14100e1c4adbfa068b2bea05f9c65f.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/namespaces.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb index b90ed6af5fb..50d3729449e 100644 --- a/lib/api/namespaces.rb +++ b/lib/api/namespaces.rb @@ -1,10 +1,7 @@ module API # namespaces API class Namespaces < Grape::API - before do - authenticate! - authenticated_as_admin! - end + before { authenticate! } resource :namespaces do # Get a namespaces list @@ -12,7 +9,11 @@ module API # Example Request: # GET /namespaces get do - @namespaces = Namespace.all + @namespaces = if current_user.admin + Namespace.all + else + current_user.namespaces + end @namespaces = @namespaces.search(params[:search]) if params[:search].present? @namespaces = paginate @namespaces |