diff options
author | Izaak Alpert <ialpert@blackberry.com> | 2013-09-05 10:17:40 -0400 |
---|---|---|
committer | Izaak Alpert <ialpert@blackberry.com> | 2013-09-05 10:41:57 -0400 |
commit | fadcc251899095e37b97091a03b2025b1f39c7a6 (patch) | |
tree | 4b90cc5188a1f62ecdbb1c3a7272de162f65a87d /lib/api/groups.rb | |
parent | 8248e1f2b83895f394a3fecd25dcea4a8b40303b (diff) | |
download | gitlab-ce-fadcc251899095e37b97091a03b2025b1f39c7a6.tar.gz |
Fixes for @randx
Change-Id: I3b15ae34c0957a0f4026e1886c92a9770e9d170e
Diffstat (limited to 'lib/api/groups.rb')
-rw-r--r-- | lib/api/groups.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index 54393740867..396554404af 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -14,9 +14,10 @@ module API end end def validate_access_level?(level) - [UsersGroup::GUEST, UsersGroup::REPORTER, UsersGroup::DEVELOPER, UsersGroup::MASTER].include? level.to_i + Gitlab::Access.options_with_owner.values.include? level.to_i end end + # Get a groups list # # Example Request: @@ -88,7 +89,7 @@ module API get ":id/members" do group = find_group(params[:id]) members = group.users_groups - users = (paginate members).collect { | member| member.user} + users = (paginate members).collect(&:user) present users, with: Entities::GroupMember, group: group end @@ -102,7 +103,7 @@ module API # POST /groups/:id/members post ":id/members" do required_attributes! [:user_id, :access_level] - if not validate_access_level?(params[:access_level]) + unless validate_access_level?(params[:access_level]) render_api_error!("Wrong access level", 422) end group = find_group(params[:id]) |