diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-14 19:32:51 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-14 19:32:51 +0300 |
| commit | c69b8e04591907d030b2cd544a606fd0e576116a (patch) | |
| tree | 317db4259219bc7f3a3ff6e3c38c802a8d086d2c /lib/api/groups.rb | |
| parent | eb4a9bfbca5427e6b9a8fcf2ed0b1f9f96ae099d (diff) | |
| download | gitlab-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/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index caa2ca97a3e..4841e04689d 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -104,7 +104,7 @@ module API # GET /groups/:id/members get ":id/members" do group = find_group(params[:id]) - members = group.users_groups + members = group.group_members users = (paginate members).collect(&:user) present users, with: Entities::GroupMember, group: group end @@ -123,11 +123,11 @@ module API render_api_error!("Wrong access level", 422) end group = find_group(params[:id]) - if group.users_groups.find_by(user_id: params[:user_id]) + if group.group_members.find_by(user_id: params[:user_id]) render_api_error!("Already exists", 409) end group.add_users([params[:user_id]], params[:access_level]) - member = group.users_groups.find_by(user_id: params[:user_id]) + member = group.group_members.find_by(user_id: params[:user_id]) present member.user, with: Entities::GroupMember, group: group end @@ -141,7 +141,7 @@ module API # DELETE /groups/:id/members/:user_id delete ":id/members/:user_id" do group = find_group(params[:id]) - member = group.users_groups.find_by(user_id: params[:user_id]) + member = group.group_members.find_by(user_id: params[:user_id]) if member.nil? render_api_error!("404 Not Found - user_id:#{params[:user_id]} not a member of group #{group.name}",404) else |
