summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-04 21:49:19 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-04 21:49:19 +0200
commita46fe875c6aea206e575e2b083bd31ed36ee1b1e (patch)
tree0b62aa051190b1a276dd0f83f671ff2be1fc7ea7 /app/controllers/users_controller.rb
parent05d713be1900988bfff9cc5a94c490519add4a62 (diff)
downloadgitlab-ce-a46fe875c6aea206e575e2b083bd31ed36ee1b1e.tar.gz
Feature: atom feed for user activity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0b442f5383a..67af1801bda 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,9 +20,14 @@ class UsersController < ApplicationController
# Get user activity feed for projects common for both users
@events = @user.recent_events.
- where(project_id: authorized_projects_ids).limit(20)
+ where(project_id: authorized_projects_ids).limit(30)
@title = @user.name
+
+ respond_to do |format|
+ format.html
+ format.atom { render layout: false }
+ end
end
def determine_layout