Merge branch '2290-user-activity'

closes #2290

diff --cc apps/workbench/app/controllers/application_controller.rb
Simple merge

diff --cc apps/workbench/app/models/arvados_base.rb
Simple merge

diff --cc apps/workbench/app/models/arvados_resource_list.rb
index 6b17ececab17c8248c3e7a60e7a7cecf41109da9,ebea76cb835e98f301d574b34246eed1fd0328c0..16a59b173e680ed39fd6e9f58b7f2adf6fb857d6
--- 1/apps/workbench/app/models/arvados_resource_list.rb
--- 2/apps/workbench/app/models/arvados_resource_list.rb
+++ b/apps/workbench/app/models/arvados_resource_list.rb
@@@ -56,8 -57,8 +62,9 @@@ class ArvadosResourceLis
      }
      api_params[:eager] = '1' if @eager
      api_params[:limit] = @limit if @limit
 +    api_params[:offset] = @offset if @offset
      api_params[:order] = @orderby_spec if @orderby_spec
+     api_params[:filters] = @filters if @filters
      res = $arvados_api_client.api @resource_class, '', api_params
      @results = $arvados_api_client.unpack_api_response res
      self