summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-24 00:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-24 00:08:51 +0000
commit1ce6af4aad0107b6d604f89a3c0b530476a10165 (patch)
tree4956b0d395cd9232bca14f83daca3cd8616cc842 /doc/api/users.md
parent24256212ea84e6fb6509f6fb317a2d2bac3d0d06 (diff)
downloadgitlab-ce-1ce6af4aad0107b6d604f89a3c0b530476a10165.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/users.md')
-rw-r--r--doc/api/users.md16
1 files changed, 12 insertions, 4 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 7694345d08b..3f9ccc24054 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -111,7 +111,9 @@ GET /users
"can_create_project": true,
"two_factor_enabled": true,
"external": false,
- "private_profile": false
+ "private_profile": false,
+ "current_sign_in_ip": "196.165.1.102",
+ "last_sign_in_ip": "172.127.2.22"
},
{
"id": 2,
@@ -142,7 +144,9 @@ GET /users
"can_create_project": true,
"two_factor_enabled": true,
"external": false,
- "private_profile": false
+ "private_profile": false,
+ "current_sign_in_ip": "10.165.1.102",
+ "last_sign_in_ip": "172.127.2.22"
}
]
```
@@ -294,7 +298,9 @@ Example Responses:
"can_create_project": true,
"two_factor_enabled": true,
"external": false,
- "private_profile": false
+ "private_profile": false,
+ "current_sign_in_ip": "196.165.1.102",
+ "last_sign_in_ip": "172.127.2.22"
}
```
@@ -534,7 +540,9 @@ GET /user
"can_create_project": true,
"two_factor_enabled": true,
"external": false,
- "private_profile": false
+ "private_profile": false,
+ "current_sign_in_ip": "196.165.1.102",
+ "last_sign_in_ip": "172.127.2.22"
}
```