Expose `last_activity_on` in the User API

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 16fa1ef6836..bcfbd9ab3c5 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -538,19 +538,17 @@ module API
 
       desc 'Get a list of user activities'
       params do
-        optional :from, type: String, desc: 'Date string in the format YEAR-MONTH-DAY'
+        optional :from, type: DateTime, default: 6.months.ago, desc: 'Date string in the format YEAR-MONTH-DAY'
         use :pagination
       end
-      get ":activities" do
+      get "activities" do
         authenticated_as_admin!
 
-        activity_set = Gitlab::UserActivities::ActivitySet.new(from: params[:from],
-                                                               page: params[:page],
-                                                               per_page: params[:per_page])
+        activities = User.
+          where(User.arel_table[:last_activity_on].gteq(params[:from])).
+          reorder(last_activity_on: :asc)
 
-        add_pagination_headers(activity_set)
-
-        present activity_set.activities, with: Entities::UserActivity
+        present paginate(activities), with: Entities::UserActivity
       end
     end
   end