[ARVADOS] updated: 27697133a18371d692d69569659dd522e7b0fbdd

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/user_agreements.js      |   9 ++
 .../app/assets/stylesheets/application.css.scss    |   4 -
 .../app/controllers/actions_controller.rb          |   1 +
 .../app/controllers/application_controller.rb      |  50 ++++----
 .../app/controllers/collections_controller.rb      |   3 +-
 apps/workbench/app/controllers/users_controller.rb |  30 ++++-
 apps/workbench/app/views/collections/show.html.erb |  19 +++
 apps/workbench/app/views/projects/_choose.html.erb |   2 +-
 .../app/views/user_agreements/index.html.erb       |  22 +---
 apps/workbench/app/views/users/inactive.html.erb   |   4 +
 apps/workbench/app/views/users/profile.html.erb    |  31 ++---
 apps/workbench/config/application.default.yml      |   6 +-
 apps/workbench/config/routes.rb                    |   1 +
 .../test/functional/collections_controller_test.rb |   2 +-
 .../test/functional/projects_controller_test.rb    |  19 ++-
 .../test/functional/users_controller_test.rb       |   6 +
 .../test/integration/application_layout_test.rb    |   8 +-
 .../workbench/test/integration/collections_test.rb |  24 ++--
 sdk/python/arvados/api.py                          | 132 +++++++++++++--------
 sdk/python/arvados/collection.py                   |  13 +-
 sdk/python/arvados/commands/put.py                 |   1 -
 sdk/python/tests/test_api.py                       |  21 ++--
 services/api/app/models/user.rb                    |  50 +++-----
 .../functional/arvados/v1/users_controller_test.rb |   8 ++
 24 files changed, 269 insertions(+), 197 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/user_agreements.js

       via  27697133a18371d692d69569659dd522e7b0fbdd (commit)
       via  6b0ad588b44ee30cd400e85031b56dcb2a8ac567 (commit)
       via  2509f755a36b2fc944689d5a1ea62729d4d6c3a5 (commit)
       via  903e49f38401ed6113f4e0ec159db8750d4db2ba (commit)
       via  d81ea65da05119d5c6480d373b5d42bbee8ae1ad (commit)
       via  301abeabd5472bdf5795ff42775be325c774c7cc (commit)
       via  f7768d3dbc6e4c4fa56cbe4906d6682120b8daa3 (commit)
       via  8917fa82999bdf0020f623db9869abae99930b56 (commit)
       via  47dc22e10fe234df3da76abdb9e704b01d57427d (commit)
       via  aa2adbcaa06c4f5dc7a6e54f3d9a5148b20fbbb1 (commit)
       via  1e368708ad2a2d553f5e716c473767c660b2f805 (commit)
       via  2e89fc72d3ad55169dbc1acf38cf040592bf25e5 (commit)
       via  f6634dddac1489a463a5eba713a0908a9c72e212 (commit)
       via  5b43256cd7462b92ed91bceaa1c864c1db2d400a (commit)
       via  accaf5ae43696ec8462e0f204a41125e14cefbc0 (commit)
       via  3bd1f8dad3a4c9abd6130c66a4cefc973398a09d (commit)
       via  1cf34cb15ce0d6885af6132196b43602c7d741d1 (commit)
       via  e14050324bb2bf7a10be5f23554036d191352a09 (commit)
       via  c4c188cdbe17d2fdfd6f14c0181876a78a2d4b2e (commit)
       via  199e61ebf83ae9ee11d8da46adb4a8897d885504 (commit)
       via  7d258618cbfa7b071d81b6bf7fa18c344d2b5f87 (commit)
       via  e7b360fd7acfaa3428b774389baf9626f7ff026c (commit)
       via  cf233d57cea2795891a40d4ecd2fdde492ab87b3 (commit)
       via  59522bd2b1a628e090d89f71d491b76a0047fdf5 (commit)
       via  201663b6f49d3f1fa95a574dccdbf63c500d59d4 (commit)
       via  ff024b6b09112e89205d01370cdab19b49d6bd50 (commit)
       via  8221eaf272a7781af6ccc5672e8bfba54283fe43 (commit)
       via  1293b79e382a0e256818c06ad7c1d5a10ff20bb5 (commit)
       via  c5f8a89d3b0a8038a31b0af049f3610b6374b6a8 (commit)
       via  2024ca087c3b9c99ebb792011b60fecdf1486467 (commit)
       via  0bd1c28bed9a0756c61037947d5a9dccd5066f00 (commit)
       via  7485476596408f9611d59e88bf78a66431460b4c (commit)
       via  edebf116a9f743a7a276d514c4cbad72c3406922 (commit)
       via  ea2fecde7e80f9d6c493bcb1bf2b7ee25fd96b12 (commit)
       via  4eae62369588616d8833010c5febc939a4820cf0 (commit)
       via  ac30c34ccfacce16cca52e155d2a0e50b0185dc3 (commit)
       via  36c360770c7925509552cfe8c3d8bf64fe1c2644 (commit)
       via  c6db15d0529212126920002665c9c99a4f864529 (commit)
      from  289e5d15402d12ad02ac77e911aca7a32746c905 (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 27697133a18371d692d69569659dd522e7b0fbdd
Merge: 289e5d1 6b0ad58
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Aug 19 11:05:33 2014 -0400

    Merge branch 'master' into 3504-clients-compatible-with-3036


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


hooks/post-receive
--