summaryrefslogtreecommitdiff
path: root/lib/api/users.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-12 12:19:45 +0100
committerRémy Coutable <remy@rymai.me>2017-04-14 15:20:55 +0200
commit91ac0e038ab51dd2f30f2bb7c91837fa588ca250 (patch)
tree54b5ea7cb6115a09bbcead558252563664b4898c /lib/api/users.rb
parent3cb84e06b7a118fb46b4e1e0d4885026c9d4a4d1 (diff)
downloadgitlab-ce-91ac0e038ab51dd2f30f2bb7c91837fa588ca250.tar.gz
Port 'Add user activities API' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r--lib/api/users.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index eedc59f8636..16fa1ef6836 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -534,6 +534,24 @@ module API
email.destroy
current_user.update_secondary_emails!
end
+
+
+ desc 'Get a list of user activities'
+ params do
+ optional :from, type: String, desc: 'Date string in the format YEAR-MONTH-DAY'
+ use :pagination
+ end
+ get ":activities" do
+ authenticated_as_admin!
+
+ activity_set = Gitlab::UserActivities::ActivitySet.new(from: params[:from],
+ page: params[:page],
+ per_page: params[:per_page])
+
+ add_pagination_headers(activity_set)
+
+ present activity_set.activities, with: Entities::UserActivity
+ end
end
end
end