summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-03 18:09:51 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-03 18:09:51 +0300
commit7984e5b1efd430ce1ea1486c647f4beaa1c13e46 (patch)
tree1ef72956cf5ecd7c16f726b99efbf5d240b0a733
parentb6f3f62667c20085d7158d5902bf4e81bf7ec515 (diff)
downloadgitlab-ce-7984e5b1efd430ce1ea1486c647f4beaa1c13e46.tar.gz
Show events from all projects on user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/controllers/users_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d42c2db9e5f..c17c6f9694a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -11,7 +11,8 @@ class UsersController < ApplicationController
end
@groups = @user.groups.accessible_to(current_user)
- @events = @user.recent_events.where(project_id: @projects.pluck(:id)).limit(20)
+ accessible_projects = @user.authorized_projects.accessible_to(current_user)
+ @events = @user.recent_events.where(project_id: accessible_projects.pluck(:id)).limit(20)
@title = @user.name
end