summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-08 17:30:10 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-08 17:30:10 +0000
commitfe9a445faaaa5a90c9308b01877aadc1984a111b (patch)
tree37314e0d8567219944c59a8d910b492cb7f840ea /doc/api
parent24663e80953ce48db600c17aa7baa91d8e38680c (diff)
parentb0d24ab1b52a78bf855a70886113b79707036029 (diff)
downloadgitlab-ce-fe9a445faaaa5a90c9308b01877aadc1984a111b.tar.gz
Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/users.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index b7fc903825e..82c57a2fd43 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -151,6 +151,8 @@ Parameters:
"name": "John Smith",
"state": "active",
"created_at": "2012-05-23T08:00:58Z",
+ "confirmed_at": "2012-05-23T08:00:58Z",
+ "last_sign_in_at": "2015-03-23T08:00:58Z",
"bio": null,
"skype": "",
"linkedin": "",