diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:20:28 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:20:28 +0200 |
commit | f71d67dda172a996b23b541b0e26c2c7edc06072 (patch) | |
tree | b4df56c135b47897507d30ac855bfc10da03781c /lib/api/entities.rb | |
parent | 66cc712fa516d758ab09f22ffe78b85cb4415740 (diff) | |
parent | a51a3fb8ed92a58b375125b19f75c3d4c545571a (diff) | |
download | gitlab-ce-add-license.tar.gz |
Merge branch 'master' into add-licenseadd-license
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index ecf1412dee5..dcfd7a8e1a7 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -6,6 +6,10 @@ module API class UserBasic < UserSafe expose :id, :state, :avatar_url + + expose :web_url do |user, options| + Rails.application.routes.url_helpers.user_url(user) + end end class User < UserBasic @@ -59,6 +63,7 @@ module API expose :namespace expose :forked_from_project, using: Entities::ForkedFromProject, if: lambda{ | project, options | project.forked? } expose :avatar_url + expose :star_count, :forks_count end class ProjectMember < UserBasic @@ -69,6 +74,11 @@ module API class Group < Grape::Entity expose :id, :name, :path, :description + expose :avatar_url + + expose :web_url do |group, options| + Rails.application.routes.url_helpers.group_url(group) + end end class GroupDetail < Group |