Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-03 14:28:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-03 14:28:54 +0300
commit41fd6d4d38aaef723e501ff3ab38ae63e31d4efb (patch)
tree65f9e06d467a90b39cfc7ea6debc3864d219f7cb /doc
parentabbf44bd6cfb29413b3cf5768b691e5b222b89ea (diff)
Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee
Diffstat (limited to 'doc')
-rw-r--r--doc/api/members.md8
-rw-r--r--doc/api/users.md2
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/api/members.md b/doc/api/members.md
index ee6d2cfa2d8..95565d40897 100644
--- a/doc/api/members.md
+++ b/doc/api/members.md
@@ -267,11 +267,11 @@ respectively.
GET /groups/:id/billable_members
```
-| Attribute | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- |--------------------------------------------------------------------------------------------------------------|
| `id` | integer/string | yes | The ID or [URL-encoded path of the group](index.md#namespaced-path-encoding) owned by the authenticated user |
-| `search` | string | no | A query string to search for group members by name, username, or email. |
-| `sort` | string | no | A query string containing parameters that specify the sort attribute and order. See supported values below.|
+| `search` | string | no | A query string to search for group members by name, username, or public email. |
+| `sort` | string | no | A query string containing parameters that specify the sort attribute and order. See supported values below. |
The supported values for the `sort` attribute are:
diff --git a/doc/api/users.md b/doc/api/users.md
index 28e1512ea12..9b79a249220 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -39,7 +39,7 @@ GET /users
]
```
-You can also search for users by name, username, primary email, or secondary email, by using `?search=`. For example. `/users?search=John`.
+You can also search for users by name, username or public email by using `?search=`. For example. `/users?search=John`.
In addition, you can lookup users by username: