diff options
author | David Yip <yipdw@member.fsf.org> | 2017-12-30 17:20:07 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-12-30 17:20:07 -0600 |
commit | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (patch) | |
tree | 5259571423a25c9a478052599c5e3d04db7fc8bd /app/controllers/concerns/user_tracking_concern.rb | |
parent | e4944d065b6bd6c6718c27700971be832ed4861a (diff) | |
parent | f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/auth/confirmations_controller.rb
Diffstat (limited to 'app/controllers/concerns/user_tracking_concern.rb')
-rw-r--r-- | app/controllers/concerns/user_tracking_concern.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/concerns/user_tracking_concern.rb b/app/controllers/concerns/user_tracking_concern.rb index 8663c3086..1e3132941 100644 --- a/app/controllers/concerns/user_tracking_concern.rb +++ b/app/controllers/concerns/user_tracking_concern.rb @@ -17,6 +17,7 @@ module UserTrackingConcern # Mark as signed-in today current_user.update_tracked_fields!(request) + ActivityTracker.record('activity:logins', current_user.id) # Regenerate feed if needed regenerate_feed! if user_needs_feed_update? |