kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #8224 from liammonahan/master

Browse source 
Expose projects_limit through users API if UserFull.
This commit is contained in:
Valeriy Sizov 2014-11-04 17:33:20 +02:00
commit 24276ed836
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/api/users.md
View file

@ -78,7 +78,8 @@ GET /users
"is_admin": false, "is_admin": false,
"avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
"can_create_group": true, "can_create_group": true,
"can_create_project": true "can_create_project": true,
"projects_limit": 100
} }
] ]
``` ```
@ -140,7 +141,8 @@ Parameters:
"color_scheme_id": 2, "color_scheme_id": 2,
"is_admin": false, "is_admin": false,
"can_create_group": true, "can_create_group": true,
"can_create_project": true "can_create_project": true,
"projects_limit": 100
} }
``` ```
@ -240,7 +242,8 @@ GET /user
"color_scheme_id": 2, "color_scheme_id": 2,
"is_admin": false, "is_admin": false,
"can_create_group": true, "can_create_group": true,
"can_create_project": true "can_create_project": true,
"projects_limit": 100
} }
``` ```

3
lib/api/entities.rb
View file

@ -16,7 +16,8 @@ module API
class UserFull < User class UserFull < User
expose :email expose :email
expose :theme_id, :color_scheme_id, :extern_uid, :provider expose :theme_id, :color_scheme_id, :extern_uid, :provider, \
:projects_limit
expose :can_create_group?, as: :can_create_group expose :can_create_group?, as: :can_create_group
expose :can_create_project?, as: :can_create_project expose :can_create_project?, as: :can_create_project
end end

1
spec/requests/api/users_spec.rb
View file

@ -433,6 +433,7 @@ describe API::API, api: true do
json_response['is_admin'].should == user.is_admin? json_response['is_admin'].should == user.is_admin?
json_response['can_create_project'].should == user.can_create_project? json_response['can_create_project'].should == user.can_create_project?
json_response['can_create_group'].should == user.can_create_group? json_response['can_create_group'].should == user.can_create_group?
json_response['projects_limit'].should == user.projects_limit
end end
it "should return 401 error if user is unauthenticated" do it "should return 401 error if user is unauthenticated" do