diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-01 18:13:08 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-01 18:13:08 +0300 |
| commit | 051090c804a4808cd43a2e5494fe7cb868314765 (patch) | |
| tree | 61a38fab494aa9c56c09f24e907bc843d16a7bc4 /lib | |
| parent | bfeed3b304aa6719b8f823de23f0cbe9712ba7de (diff) | |
| parent | 303350567c7b2bf140fa17d3f3f473ad9ece4e45 (diff) | |
Merge branch 'feature/set-public-email-through-api' into 'master'
Set public email through api
Closes #37675
See merge request gitlab-org/gitlab-ce!21938
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index ac09ca7f7b7..9cf0d44f9fb 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -42,12 +42,12 @@ module API optional :provider, type: String, desc: 'The external provider' optional :bio, type: String, desc: 'The biography of the user' optional :location, type: String, desc: 'The location of the user' + optional :public_email, type: String, desc: 'The public email of the user' optional :admin, type: Boolean, desc: 'Flag indicating the user is an administrator' optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups' optional :external, type: Boolean, desc: 'Flag indicating the user is an external user' optional :avatar, type: File, desc: 'Avatar image for user' optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' - optional :min_access_level, type: Integer, values: Gitlab::Access.all_values, desc: 'Limit by minimum access level of authenticated user' all_or_none_of :extern_uid, :provider end |