summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-21 04:19:16 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-09-21 04:19:16 -0700
commit131553627d2e62cea2ea8a342250ca2d2495d8fc (patch)
tree0011e2fb22baf6d410837cdcafdc23cac872ccec /lib/api/entities.rb
parent10d3a30b255cd85b2cf7af39814fd7418eecd838 (diff)
parent25b745271a1db25fc709ae13737b04c1f94cdb95 (diff)
downloadgitlab-ce-131553627d2e62cea2ea8a342250ca2d2495d8fc.tar.gz
Merge pull request #1521 from NARKOZ/api
API for project team members
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1909a016208..fd19fa0e87f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -29,9 +29,10 @@ module Gitlab
expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :created_at
end
- class UsersProject < Grape::Entity
- expose :user, using: Entities::UserBasic
- expose :project_access
+ class ProjectMember < UserBasic
+ expose :project_access, :as => :access_level do |user, options|
+ options[:project].users_projects.find_by_user_id(user.id).project_access
+ end
end
class RepoObject < Grape::Entity