[ARVADOS] updated: 192de21f18038794b56a1a0ec95c76e8e0eb1309

[git at public.curoverse.com]

Summary of changes:
 .../app/controllers/application_controller.rb      | 19 +++++++--
 .../app/controllers/collections_controller.rb      |  2 +
 apps/workbench/app/controllers/users_controller.rb |  1 -
 apps/workbench/app/helpers/application_helper.rb   |  3 +-
 apps/workbench/app/views/application/show.html.erb |  3 +-
 apps/workbench/app/views/collections/show.html.erb |  9 +++--
 .../app/views/layouts/application.html.erb         |  2 +-
 .../views/pipeline_instances/_show_inputs.html.erb |  4 +-
 apps/workbench/app/views/users/inactive.html.erb   | 22 +++++++++++
 apps/workbench/app/views/users/welcome.html.erb    | 45 ++++++++++++++--------
 .../test/functional/collections_controller_test.rb | 12 ++++++
 .../test/functional/folders_controller_test.rb     | 11 ++++--
 apps/workbench/test/integration/logins_test.rb     |  3 +-
 13 files changed, 103 insertions(+), 33 deletions(-)
 create mode 100644 apps/workbench/app/views/users/inactive.html.erb

       via  192de21f18038794b56a1a0ec95c76e8e0eb1309 (commit)
       via  3c2ad38a0335977ce015c1b54267d466d85d2d1b (commit)
       via  d17532201983ac55fc395240f722338f34c7210b (commit)
       via  d9e2cb7b64063741b4b1243f9ad630f55be93840 (commit)
       via  ef378f40946e37c904234f933743e499d981faf3 (commit)
       via  ac84cd774f837fd1feced6e2f535fe4c2e0518a8 (commit)
       via  45648db225a107b6475c04c105f5db3c58570811 (commit)
      from  94e8dd9891a2c163f9d668f251c38e9a0979ef49 (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 192de21f18038794b56a1a0ec95c76e8e0eb1309
Merge: 94e8dd9 3c2ad38
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 6 07:27:16 2014 -0400

    Merge branch '2872-folder-nav' into 2872-folder-nav-tests


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


hooks/post-receive
--