Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
f4d05dcc
Commit
f4d05dcc
authored
May 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-api
Add current_sign_in_at to api User
parents
e9e79fdf
361284fe
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
CHANGELOG
CHANGELOG
+1
-0
doc/api/users.md
doc/api/users.md
+4
-2
lib/api/entities.rb
lib/api/entities.rb
+1
-1
No files found.
CHANGELOG
View file @
f4d05dcc
...
...
@@ -42,6 +42,7 @@ v 7.11.0 (unreleased)
- Add room notification and message color option for HipChat
- Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add current_sign_in_at to UserFull REST api.
v 7.10.0
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
...
...
doc/api/users.md
View file @
f4d05dcc
...
...
@@ -57,7 +57,8 @@ GET /users
"color_scheme_id"
:
2
,
"is_admin"
:
false
,
"avatar_url"
:
"http://localhost:3000/uploads/user/avatar/1/cd8.jpeg"
,
"can_create_group"
:
true
"can_create_group"
:
true
,
"current_sign_in_at"
:
"2014-03-19T13:12:15Z"
},
{
"id"
:
2
,
...
...
@@ -79,7 +80,8 @@ GET /users
"avatar_url"
:
"http://localhost:3000/uploads/user/avatar/1/cd8.jpeg"
,
"can_create_group"
:
true
,
"can_create_project"
:
true
,
"projects_limit"
:
100
"projects_limit"
:
100
,
"current_sign_in_at"
:
"2014-03-19T17:54:13Z"
}
]
```
...
...
lib/api/entities.rb
View file @
f4d05dcc
...
...
@@ -20,7 +20,7 @@ module API
class
UserFull
<
User
expose
:email
expose
:theme_id
,
:color_scheme_id
,
:projects_limit
expose
:theme_id
,
:color_scheme_id
,
:projects_limit
,
:current_sign_in_at
expose
:identities
,
using:
Entities
::
Identity
expose
:can_create_group?
,
as: :can_create_group
expose
:can_create_project?
,
as: :can_create_project
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment