summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-23 15:24:55 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-23 15:24:55 +0000
commitf2b00e7ce1ee1096d8ec4df1eb0ca614b786804d (patch)
treeb131a60230a63c40cf5c144a2a5b14ddf396e110 /lib
parent4e290454106e39c3c9487c672d6ee1178dce1410 (diff)
parent301a30e0ea573c83c28358b2c856396fda878089 (diff)
downloadgitlab-ce-f2b00e7ce1ee1096d8ec4df1eb0ca614b786804d.tar.gz
Merge branch 'add-project-permissions' into 'master'
Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
Diffstat (limited to 'lib')
-rw-r--r--lib/api/projects.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 5e75cd35c56..a9e0960872a 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -25,7 +25,7 @@ module API
@projects = current_user.authorized_projects
@projects = filter_projects(@projects)
@projects = paginate @projects
- present @projects, with: Entities::Project
+ present @projects, with: Entities::ProjectWithAccess, user: current_user
end
# Get an owned projects list for authenticated user
@@ -36,7 +36,7 @@ module API
@projects = current_user.owned_projects
@projects = filter_projects(@projects)
@projects = paginate @projects
- present @projects, with: Entities::Project
+ present @projects, with: Entities::ProjectWithAccess, user: current_user
end
# Gets starred project for the authenticated user
@@ -59,7 +59,7 @@ module API
@projects = Project.all
@projects = filter_projects(@projects)
@projects = paginate @projects
- present @projects, with: Entities::Project
+ present @projects, with: Entities::ProjectWithAccess, user: current_user
end
# Get a single project