diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e86601a..28da6da 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -11,6 +11,7 @@ class UsersController < ApplicationController end @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20) @title = @user.name + @groups = @projects.map(&:group).compact.uniq end def determine_layout diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 98210af..fda4793 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -14,7 +14,7 @@ %small member since #{@user.created_at.stamp("Nov 12, 2031")} .clearfix %h4 Groups: - = render 'groups', groups: @user.groups + = render 'groups', groups: @groups %hr %h4 User Activity: = render @events -- libgit2 0.21.2