diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2017-09-15 20:14:53 +0000 |
| commit | 25c959f94d3dda63120256735163e4a142b8711e (patch) | |
| tree | 4c6e544a665dab5b59106ace9638dca16b71d806 /doc/api | |
| parent | b20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff) | |
| parent | 3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff) | |
| download | gitlab-ce-issue_37640.tar.gz | |
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts:
# db/schema.rb
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/keys.md | 1 | ||||
| -rw-r--r-- | doc/api/session.md | 1 | ||||
| -rw-r--r-- | doc/api/users.md | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/api/keys.md b/doc/api/keys.md index 376ac27df3a..ddcf7830621 100644 --- a/doc/api/keys.md +++ b/doc/api/keys.md @@ -32,6 +32,7 @@ Parameters: "twitter": "", "website_url": "", "email": "john@example.com", + "theme_id": 2, "color_scheme_id": 1, "projects_limit": 10, "current_sign_in_at": null, diff --git a/doc/api/session.md b/doc/api/session.md index f79eac11689..b97e26f34a2 100644 --- a/doc/api/session.md +++ b/doc/api/session.md @@ -39,6 +39,7 @@ Example response: "twitter": "", "website_url": "", "email": "john@example.com", + "theme_id": 1, "color_scheme_id": 1, "projects_limit": 10, "current_sign_in_at": "2015-07-07T07:10:58.392Z", 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, |