diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-22 19:41:12 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-22 19:41:12 -0700 |
| commit | fee1f2e0ab0336e6746aae8e9ed76549c6ac3353 (patch) | |
| tree | 226442a015ed2b33035888110b2af5efbed6e556 /app/controllers/users_controller.rb | |
| parent | 99682502119fa67f229b3e8d3c3ed0ccb68b29f9 (diff) | |
| download | gitlab-ce-fee1f2e0ab0336e6746aae8e9ed76549c6ac3353.tar.gz | |
Fix atom feed for user pageuserpage-activity-scroll
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 95ee9e83dbd..5c618001fdf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,7 +21,12 @@ class UsersController < ApplicationController 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) |