diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 17:05:29 -0500 |
| commit | b3e4bc5911737db82f2b296a0eed7fcb59fa28bb (patch) | |
| tree | 948797dd0033eb26b2930b1db1608cdfdf4ca42d /lib/api/projects.rb | |
| parent | 7e43fa67096f60856d1cf862f245367bc710a44f (diff) | |
| parent | 1100eb0c4e319518c3878bba4ac16cf344168ca6 (diff) | |
| download | gitlab-ce-b3e4bc5911737db82f2b296a0eed7fcb59fa28bb.tar.gz | |
resolves conflicts with new buttons
Diffstat (limited to 'lib/api/projects.rb')
| -rw-r--r-- | lib/api/projects.rb | 6 |
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 |