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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c90af4d5
Commit
c90af4d5
authored
Dec 14, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update user API
parent
0c9e2e70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
lib/api/users.rb
lib/api/users.rb
+7
-5
No files found.
lib/api/users.rb
View file @
c90af4d5
...
@@ -461,17 +461,19 @@ module API
...
@@ -461,17 +461,19 @@ module API
success
Entities
::
UserBasic
success
Entities
::
UserBasic
end
end
params
do
params
do
optional
:
due_date
,
type:
String
,
desc:
'Date time string in the format YEAR-MONTH-DAY'
optional
:
from
,
type:
String
,
desc:
'Date time string in the format YEAR-MONTH-DAY'
use
:pagination
use
:pagination
end
end
get
":activities"
do
get
":activities"
do
authenticated_as_admin!
authenticated_as_admin!
raw_activities
=
Gitlab
::
User
::
ActivitySet
.
query
(
from:
params
[
:from
],
activity_set
=
Gitlab
::
User
::
ActivitySet
.
new
(
from:
params
[
:from
],
page:
params
[
:page
],
page:
params
[
:page
],
per_page:
params
[
:per_page
])
per_page:
params
[
:per_page
])
present
Gitlab
::
User
::
Activity
.
from_array
(
raw_activities
),
with:
Entities
::
UserActivity
add_pagination_headers
(
activity_set
)
present
activity_set
.
activities
,
with:
Entities
::
UserActivity
end
end
end
end
end
end
...
...
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