diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:08:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:08:54 +0300 |
| commit | 11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (patch) | |
| tree | 999fdffb9d3db2e5200994e289e50fa3a3a1684a /doc/api | |
| parent | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/protected_branches.md | 1 | ||||
| -rw-r--r-- | doc/api/users.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/protected_branches.md b/doc/api/protected_branches.md index fe950a38b69..e59d7130356 100644 --- a/doc/api/protected_branches.md +++ b/doc/api/protected_branches.md @@ -24,6 +24,7 @@ GET /projects/:id/protected_branches | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user | +| `search` | string | no | Name or part of the name of protected branches to be searched for | ```shell curl --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/projects/5/protected_branches' diff --git a/doc/api/users.md b/doc/api/users.md index 0e19207f279..601db1c790b 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -1376,6 +1376,7 @@ The activities that update the timestamp are: - Git HTTP/SSH activities (such as clone, push) - User logging in into GitLab - User visiting pages related to Dashboards, Projects, Issues and Merge Requests ([introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/54947) in GitLab 11.8) +- User using the API By default, it shows the activity for all users in the last 6 months, but this can be amended by using the `from` parameter. |