diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/api/users.md | 6 | ||||
| -rw-r--r-- | doc/raketasks/user_management.md | 9 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 72ae0b4f24d..671b41b26e2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -43,6 +43,7 @@ v 7.11.0 (unreleased) - Add room notification and message color option for HipChat - Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka) - Add footnotes support to Markdown (Guillaume Delbergue) + - Add current_sign_in_at to UserFull REST api. v 7.10.0 - Ignore submodules that are defined in .gitmodules but are checked in as directories. diff --git a/doc/api/users.md b/doc/api/users.md index a8b7685b503..cd141daadc8 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -57,7 +57,8 @@ GET /users "color_scheme_id": 2, "is_admin": false, "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", - "can_create_group": true + "can_create_group": true, + "current_sign_in_at": "2014-03-19T13:12:15Z" }, { "id": 2, @@ -79,7 +80,8 @@ GET /users "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg", "can_create_group": true, "can_create_project": true, - "projects_limit": 100 + "projects_limit": 100, + "current_sign_in_at": "2014-03-19T17:54:13Z" } ] ``` diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md index 80b01ca4043..4fbd20762da 100644 --- a/doc/raketasks/user_management.md +++ b/doc/raketasks/user_management.md @@ -47,3 +47,12 @@ sudo gitlab-rake gitlab:import:all_users_to_all_groups # installation from source bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production ``` + +## Maintain tight control over the number of active users on your GitLab installation + +- Enable this setting to keep new users blocked until they have been cleared by the admin (default: false). + + +``` +block_auto_created_users: false +``` diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 79b4afa40ba..b23eff3661c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -20,7 +20,7 @@ module API class UserFull < User expose :email - expose :theme_id, :color_scheme_id, :projects_limit + expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project |