diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-18 11:46:10 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-18 11:46:10 -0200 |
| commit | 95a67cdbcfb52242a2736c79605e37a6d533640e (patch) | |
| tree | de9ce40243fd12a47e82b3256a68d83d1fba15b1 /lib/api | |
| parent | 4163eb56d91f75f62d562034140b0b4debecb315 (diff) | |
| parent | 08ddb8f7689ec0d50e6c28e90f5eb7ab107fd0d3 (diff) | |
| download | gitlab-ce-95a67cdbcfb52242a2736c79605e37a6d533640e.tar.gz | |
Merge branch 'master' into branch-invalid-name
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 075d0dde715..f8511ac5f5c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -70,7 +70,7 @@ module API expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ |project, options| project.forked? } expose :avatar_url expose :star_count, :forks_count - expose :open_issues_count, if: lambda { | project, options | project.issues_enabled? && project.default_issues_tracker? } + expose :open_issues_count, if: lambda { |project, options| project.issues_enabled? && project.default_issues_tracker? } end class ProjectMember < UserBasic diff --git a/lib/api/projects.rb b/lib/api/projects.rb index bdf4b77596e..5e75cd35c56 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -39,6 +39,17 @@ module API present @projects, with: Entities::Project end + # Gets starred project for the authenticated user + # + # Example Request: + # GET /projects/starred + get '/starred' do + @projects = current_user.starred_projects + @projects = filter_projects(@projects) + @projects = paginate @projects + present @projects, with: Entities::Project + end + # Get all projects for admin user # # Example Request: |