diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 12:44:10 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-23 12:44:10 +0300 |
| commit | 6fb7fb5c1a44926511914080334774b21a5ee9af (patch) | |
| tree | 4fdf8530c98576fd19c306a3c74540998bee9fd0 /app/controllers/users_controller.rb | |
| parent | 3b53b553b78d20268d228afa596b53d18046f98e (diff) | |
| parent | 801cf92310e9f6950dddba848ef1e6a3d1e48ef0 (diff) | |
Merge branch 'master' into experimental-top-nav
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c211106fbaa..8131eba6a2f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -106,11 +106,11 @@ class UsersController < ApplicationController def load_events # Get user activity feed for projects common for both users - @events = user.recent_events. - merge(projects_for_current_user). - references(:project). - with_associations. - limit_recent(20, params[:offset]) + @events = user.recent_events + .merge(projects_for_current_user) + .references(:project) + .with_associations + .limit_recent(20, params[:offset]) end def load_projects |