summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-14 19:32:51 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-14 19:32:51 +0300
commitc69b8e04591907d030b2cd544a606fd0e576116a (patch)
tree317db4259219bc7f3a3ff6e3c38c802a8d086d2c /lib/api/entities.rb
parenteb4a9bfbca5427e6b9a8fcf2ed0b1f9f96ae099d (diff)
downloadgitlab-ce-c69b8e04591907d030b2cd544a606fd0e576116a.tar.gz
Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 74fdef93543..d012a6056f5 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -54,7 +54,7 @@ module API
class ProjectMember < UserBasic
expose :project_access, as: :access_level do |user, options|
- options[:project].users_projects.find_by(user_id: user.id).project_access
+ options[:project].project_members.find_by(user_id: user.id).project_access
end
end
@@ -68,7 +68,7 @@ module API
class GroupMember < UserBasic
expose :group_access, as: :access_level do |user, options|
- options[:group].users_groups.find_by(user_id: user.id).group_access
+ options[:group].group_members.find_by(user_id: user.id).group_access
end
end
@@ -182,12 +182,12 @@ module API
class ProjectWithAccess < Project
expose :permissions do
expose :project_access, using: Entities::ProjectAccess do |project, options|
- project.users_projects.find_by(user_id: options[:user].id)
+ project.project_members.find_by(user_id: options[:user].id)
end
expose :group_access, using: Entities::GroupAccess do |project, options|
if project.group
- project.group.users_groups.find_by(user_id: options[:user].id)
+ project.group.group_members.find_by(user_id: options[:user].id)
end
end
end