summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-18 09:38:46 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-18 09:38:46 -0800
commit63f11a68c5e9edf36d062bd4f029d81a0861ef82 (patch)
tree45edeacc3b0e8f102bc43bbc5e693f52b64ce1f9 /app/controllers/users_controller.rb
parenta6070074bc30cf2e6c9eb9b053fc79bdd35d9d6b (diff)
downloadgitlab-ce-63f11a68c5e9edf36d062bd4f029d81a0861ef82.tar.gz
Fix event loading with associations
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b4de500fcf1..8c5605c8b4b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,7 +20,7 @@ class UsersController < ApplicationController
# Get user activity feed for projects common for both users
@events = @user.recent_events.
where(project_id: authorized_projects_ids).
- includes(:target, project: :namespace).limit(30)
+ with_associations.limit(30)
@title = @user.name
@title_url = user_path(@user)