summaryrefslogtreecommitdiff
path: root/doc/api/users.md
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
commit9b177bb7c94df6c7d3868235f75939a41acf8718 (patch)
treeef8541d3ef8047f2ac6711b6e030244f812b7b49 /doc/api/users.md
parent73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff)
downloadgitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'doc/api/users.md')
-rw-r--r--doc/api/users.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 9f3e4caf2f4..6d5db16b36a 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -72,6 +72,7 @@ GET /users
"organization": "",
"last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z",
+ "theme_id": 1,
"last_activity_on": "2012-05-23",
"color_scheme_id": 2,
"projects_limit": 100,
@@ -105,6 +106,7 @@ GET /users
"organization": "",
"last_sign_in_at": null,
"confirmed_at": "2012-05-30T16:53:06.148Z",
+ "theme_id": 1,
"last_activity_on": "2012-05-23",
"color_scheme_id": 3,
"projects_limit": 100,
@@ -215,6 +217,7 @@ Parameters:
"organization": "",
"last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z",
+ "theme_id": 1,
"last_activity_on": "2012-05-23",
"color_scheme_id": 2,
"projects_limit": 100,
@@ -341,6 +344,7 @@ GET /user
"organization": "",
"last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z",
+ "theme_id": 1,
"last_activity_on": "2012-05-23",
"color_scheme_id": 2,
"projects_limit": 100,
@@ -387,6 +391,7 @@ GET /user
"organization": "",
"last_sign_in_at": "2012-06-01T11:41:01Z",
"confirmed_at": "2012-05-23T09:05:22Z",
+ "theme_id": 1,
"last_activity_on": "2012-05-23",
"color_scheme_id": 2,
"projects_limit": 100,