1 files changed, 19 insertions, 6 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f9b568b8af9..679d6897ce9 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -13,17 +13,21 @@ class UsersController < ApplicationController
     # Collect only groups common for both users
     @groups = @user.groups & GroupsFinder.new.execute(current_user)
 
-    # Get user activity feed for projects common for both users
-    @events = @user.recent_events.
-      where(project_id: authorized_projects_ids).
-      with_associations.limit(30)
-
     @title = @user.name
     @title_url = user_path(@user)
 
     respond_to do |format|
       format.html
-      format.atom { render layout: false }
+
+      format.atom do
+        load_events
+        render layout: false
+      end
+
+      format.json do
+        load_events
+        pager_json("events/_events", @events.count)
+      end
     end
   end
 
@@ -81,4 +85,13 @@ class UsersController < ApplicationController
     @contributions_calendar ||= Gitlab::ContributionsCalendar.
       new(contributed_projects.reject(&:forked?), @user)
   end
+
+  def load_events
+    # Get user activity feed for projects common for both users
+    @events = @user.recent_events.
+      where(project_id: authorized_projects_ids).
+      with_associations
+
+    @events = @events.limit(20).offset(params[:offset] || 0)
+  end
 end