[ARVADOS] updated: 4baccff09d5f8c48cc3c431365f1e029a8c40bb1

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      |    3 +-
 apps/workbench/app/controllers/users_controller.rb |   63 +++++++++++++++++-
 apps/workbench/app/helpers/application_helper.rb   |   14 +++--
 apps/workbench/app/models/arvados_base.rb          |    4 +
 apps/workbench/app/models/arvados_resource_list.rb |    7 ++
 .../app/views/users/_show_activity.html.erb        |    4 +
 apps/workbench/app/views/users/activity.html.erb   |   72 ++++++++++++++++++++
 apps/workbench/config/routes.rb                    |    1 +
 8 files changed, 161 insertions(+), 7 deletions(-)
 create mode 100644 apps/workbench/app/views/users/_show_activity.html.erb
 create mode 100644 apps/workbench/app/views/users/activity.html.erb

       via  4baccff09d5f8c48cc3c431365f1e029a8c40bb1 (commit)
       via  ea812dad57e1e31cfce0167a8b8431aad15bf01a (commit)
       via  af19eb3a35900457a1dcfadee789a9052fb50335 (commit)
       via  7db862a48062c6086ea8a6787149afa7d66b1919 (commit)
       via  cf7e30873ef4b92cc8ec099b2bb344391a070e93 (commit)
       via  4127b85f2c1af611bb70d5ab469adac126d0a7a4 (commit)
       via  2d9d106c40b83e9a72d431bdb198ed5b8b13550a (commit)
       via  acf1ba5bb4d987012030de8978cc6930e1bee654 (commit)
       via  fca114122bb204b34414a17e278748ec8e87e136 (commit)
       via  b37cf5e27548d8af4ec355c9a102c9a5734b3306 (commit)
      from  968a749a6981074ba2159df70adde92b2e681263 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4baccff09d5f8c48cc3c431365f1e029a8c40bb1
Merge: 968a749 ea812da
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Mar 24 10:22:20 2014 -0400

    Merge branch '2290-user-activity'
    
    closes #2290

diff --cc apps/workbench/app/models/arvados_resource_list.rb
index 6b17ece,ebea76c..16a59b1
--- a/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

-----------------------------------------------------------------------


hooks/post-receive
--