summaryrefslogtreecommitdiff
path: root/lib/api/project_members.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/project_members.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/project_members.rb')
-rw-r--r--lib/api/project_members.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/project_members.rb b/lib/api/project_members.rb
index 47c4ddce163..9e2b12b1311 100644
--- a/lib/api/project_members.rb
+++ b/lib/api/project_members.rb
@@ -56,7 +56,7 @@ module API
# either the user is already a team member or a new one
team_member = user_project.team_member_by_id(params[:user_id])
if team_member.nil?
- team_member = user_project.users_projects.new(
+ team_member = user_project.project_members.new(
user_id: params[:user_id],
project_access: params[:access_level]
)
@@ -82,7 +82,7 @@ module API
authorize! :admin_project, user_project
required_attributes! [:access_level]
- team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+ team_member = user_project.project_members.find_by(user_id: params[:user_id])
not_found!("User can not be found") if team_member.nil?
if team_member.update_attributes(project_access: params[:access_level])
@@ -102,7 +102,7 @@ module API
# DELETE /projects/:id/members/:user_id
delete ":id/members/:user_id" do
authorize! :admin_project, user_project
- team_member = user_project.users_projects.find_by(user_id: params[:user_id])
+ team_member = user_project.project_members.find_by(user_id: params[:user_id])
unless team_member.nil?
team_member.destroy
else