diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 09:09:01 +0000 |
commit | c72e5ebe9938d315ec598197873e71a80168d40a (patch) | |
tree | 439bf5c40aaf774e5a301825af517cb52726f450 /doc/api/users.md | |
parent | ffc43b862df32a590eae874bcbb11109b46dc8be (diff) | |
download | gitlab-ce-c72e5ebe9938d315ec598197873e71a80168d40a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/users.md')
-rw-r--r-- | doc/api/users.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index ecd3c306d81..2c1d68be964 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -435,8 +435,8 @@ Parameters: On password update, user will be forced to change it upon next login. Note, at the moment this method does only return a `404` error, -even in cases where a `409` (Conflict) would be more appropriate, -e.g. when renaming the email address to some existing one. +even in cases where a `409` (Conflict) would be more appropriate. +For example, when renaming the email address to some existing one. ## Delete authentication identity from user @@ -1389,7 +1389,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 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 @@ -1403,7 +1403,7 @@ Parameters: | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | -| `from` | string | no | Date string in the format YEAR-MONTH-DAY, e.g. `2016-03-11`. Defaults to 6 months ago. | +| `from` | string | no | Date string in the format YEAR-MONTH-DAY. For example, `2016-03-11`. Defaults to 6 months ago. | ```shell curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/user/activities |