diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2014-11-04 17:33:20 +0200 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2014-11-04 17:33:20 +0200 |
| commit | 24276ed8366cf64e685034086b6e85d15a632d26 (patch) | |
| tree | 37a94998ac885058c9db7f2863058f1af3615aab | |
| parent | 9cf50550d7a7616cd5dba382bdd7c65473a9c95d (diff) | |
| parent | 2edf212a8be3bb14b844b542df587b6029897fe6 (diff) | |
| download | gitlab-ce-24276ed8366cf64e685034086b6e85d15a632d26.tar.gz | |
Merge pull request #8224 from liammonahan/master
Expose projects_limit through users API if UserFull.
| -rw-r--r-- | doc/api/users.md | 9 | ||||
| -rw-r--r-- | lib/api/entities.rb | 3 | ||||
| -rw-r--r-- | spec/requests/api/users_spec.rb | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 3fdd3a75e88..20e0d68977e 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -78,7 +78,8 @@ GET /users "is_admin": false, "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", "can_create_group": true, - "can_create_project": true + "can_create_project": true, + "projects_limit": 100 } ] ``` @@ -140,7 +141,8 @@ Parameters: "color_scheme_id": 2, "is_admin": false, "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, "is_admin": false, "can_create_group": true, - "can_create_project": true + "can_create_project": true, + "projects_limit": 100 } ``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 4e7b1c91c4e..40696489ba2 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -16,7 +16,8 @@ module API class UserFull < User 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_project?, as: :can_create_project end diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index bc1598273be..3bb6191ed9f 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -433,6 +433,7 @@ describe API::API, api: true do json_response['is_admin'].should == user.is_admin? json_response['can_create_project'].should == user.can_create_project? json_response['can_create_group'].should == user.can_create_group? + json_response['projects_limit'].should == user.projects_limit end it "should return 401 error if user is unauthenticated" do |