Merge branch '2290-user-activity'
authorTom Clegg <tom@curoverse.com>
Mon, 24 Mar 2014 14:22:20 +0000 (10:22 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 24 Mar 2014 14:22:20 +0000 (10:22 -0400)
commit4baccff09d5f8c48cc3c431365f1e029a8c40bb1
tree600789c35ee9c945d1583e862ce0977081c2723b
parent968a749a6981074ba2159df70adde92b2e681263
parentea812dad57e1e31cfce0167a8b8431aad15bf01a
Merge branch '2290-user-activity'

closes #2290
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/app/models/arvados_resource_list.rb