Commit c90af4d5 authored by James Lopez's avatar James Lopez

update user API

parent 0c9e2e70
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment