Merge branch 'fix-activity-feed' into 'release-1.2.1'

Fixed activity feed on all Projects page

See merge request !185
4 jobs for release-1.2.1 in 7 minutes and 11 seconds (queued for 1 second)