diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-03 12:27:06 +0200 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-07-03 12:48:42 +0200 |
commit | 9671ca19de430e49b6cb2a51d2405c640dfddd16 (patch) | |
tree | e84c6910011c124f0df9dc147cca4d8fec30dcee /doc/api/users.md | |
parent | 9b06890d1d6901b840fb321c9b99264c2e8813f7 (diff) | |
download | gitlab-ce-9671ca19de430e49b6cb2a51d2405c640dfddd16.tar.gz |
Re-align CE and EE API docsdocs/api-single-codebase
Diffstat (limited to 'doc/api/users.md')
-rw-r--r-- | doc/api/users.md | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 5615dcdd307..6be097e6364 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -147,6 +147,24 @@ GET /users ] ``` +Users on GitLab [Silver or higher](https://about.gitlab.com/pricing/) will also see +the `group_saml` provider option: + +```json +[ + { + "id": 1, + ... + "identities": [ + {"provider": "github", "extern_uid": "2435223452345"}, + {"provider": "bitbucket", "extern_uid": "john.smith"}, + {"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"}, + {"provider": "group_saml", "extern_uid": "123789", "saml_provider_id": 10} + ], + ... + } +] + You can lookup users by external UID and provider: ``` @@ -260,14 +278,13 @@ Example Responses: "can_create_project": true, "two_factor_enabled": true, "external": false, - "private_profile": false, - "shared_runners_minutes_limit": 133 - "extra_shared_runners_minutes_limit": 133 + "private_profile": false } ``` Users on GitLab [Starter, Bronze, or higher](https://about.gitlab.com/pricing/) will also see -the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` parameters: **[STARTER]** +the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` parameters. +Users on GitLab Silver will also see the `group_saml` option: ```json { @@ -275,6 +292,12 @@ the `shared_runners_minutes_limit` and `extra_shared_runners_minutes_limit` para "username": "john_smith", "shared_runners_minutes_limit": 133, "extra_shared_runners_minutes_limit": 133 + "identities": [ + {"provider": "github", "extern_uid": "2435223452345"}, + {"provider": "bitbucket", "extern_uid": "john.smith"}, + {"provider": "google_oauth2", "extern_uid": "8776128412476123468721346"}, + {"provider": "group_saml", "extern_uid": "123789", "saml_provider_id": 10} + ], ... } ``` @@ -1285,4 +1308,4 @@ Example response: Please note that `last_activity_at` is deprecated, please use `last_activity_on`. -[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json
\ No newline at end of file +[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json |