Commit 01cb4052 authored by Fiona Neill's avatar Fiona Neill

Merge branch 'mk_update_user_docs' into 'master'

Update user docs

See merge request gitlab-org/gitlab!85198
parents 07f86bf6 cd92dcad
...@@ -305,8 +305,11 @@ Parameters: ...@@ -305,8 +305,11 @@ Parameters:
"website_url": "", "website_url": "",
"organization": "", "organization": "",
"job_title": "Operations Specialist", "job_title": "Operations Specialist",
"pronouns": "he/him",
"work_information": null,
"followers": 1, "followers": 1,
"following": 1 "following": 1,
"local_time": "3:38 PM"
} }
``` ```
...@@ -346,6 +349,11 @@ Example Responses: ...@@ -346,6 +349,11 @@ Example Responses:
"website_url": "", "website_url": "",
"organization": "", "organization": "",
"job_title": "Operations Specialist", "job_title": "Operations Specialist",
"pronouns": "he/him",
"work_information": null,
"followers": 1,
"following": 1,
"local_time": "3:38 PM",
"last_sign_in_at": "2012-06-01T11:41:01Z", "last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z", "confirmed_at": "2012-05-23T09:05:22Z",
"theme_id": 1, "theme_id": 1,
...@@ -580,6 +588,13 @@ GET /user ...@@ -580,6 +588,13 @@ GET /user
"twitter": "", "twitter": "",
"website_url": "", "website_url": "",
"organization": "", "organization": "",
"job_title": "",
"pronouns": "he/him",
"bot": false,
"work_information": null,
"followers": 0,
"following": 0,
"local_time": "3:38 PM",
"last_sign_in_at": "2012-06-01T11:41:01Z", "last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z", "confirmed_at": "2012-05-23T09:05:22Z",
"theme_id": 1, "theme_id": 1,
...@@ -596,10 +611,13 @@ GET /user ...@@ -596,10 +611,13 @@ GET /user
"can_create_project": true, "can_create_project": true,
"two_factor_enabled": true, "two_factor_enabled": true,
"external": false, "external": false,
"private_profile": false "private_profile": false,
"commit_email": "admin@example.com",
} }
``` ```
Users on [GitLab Premium or higher](https://about.gitlab.com/pricing/) also see the `shared_runners_minutes_limit`, `extra_shared_runners_minutes_limit` parameters.
## List current user (for admins) ## List current user (for admins)
> The `namespace_id` field in the response was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82045) in GitLab 14.10. > The `namespace_id` field in the response was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82045) in GitLab 14.10.
...@@ -654,7 +672,8 @@ Parameters: ...@@ -654,7 +672,8 @@ Parameters:
"commit_email": "john-codes@example.com", "commit_email": "john-codes@example.com",
"current_sign_in_ip": "196.165.1.102", "current_sign_in_ip": "196.165.1.102",
"last_sign_in_ip": "172.127.2.22", "last_sign_in_ip": "172.127.2.22",
"namespace_id": 1 "namespace_id": 1,
"note": null
} }
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment