[ARVADOS] updated: 385f300ba44bc186aa679d5aba543260e8ffee1e

[git at public.curoverse.com]

Summary of changes:
 ...zations.js.coffee => user_agreements.js.coffee} |    0
 ..._machines.css.scss => user_agreements.css.scss} |    2 +-
 .../app/controllers/application_controller.rb      |   15 ++++
 .../app/controllers/collections_controller.rb      |   38 +++++++++
 .../app/controllers/user_agreements_controller.rb  |   18 +++++
 .../app/helpers/user_agreements_helper.rb          |    2 +
 apps/workbench/app/models/user.rb                  |    6 ++
 apps/workbench/app/models/user_agreement.rb        |   10 +++
 .../app/views/layouts/application.html.erb         |    3 +
 .../app/views/user_agreements/index.html.erb       |   45 +++++++++++
 apps/workbench/config/routes.rb                    |   10 +--
 .../functional/user_agreements_controller_test.rb  |    4 +
 .../unit/helpers/user_agreements_helper_test.rb    |    4 +
 .../unit/{group_test.rb => user_agreement_test.rb} |    2 +-
 .../api/app/controllers/application_controller.rb  |    2 +-
 .../arvados/v1/user_agreements_controller.rb       |   81 ++++++++++++++++++++
 .../app/controllers/arvados/v1/users_controller.rb |   42 ++++++++++
 services/api/app/models/user.rb                    |    7 ++
 services/api/app/models/user_agreement.rb          |    4 +
 services/api/config/routes.rb                      |    4 +
 .../test/fixtures/api_client_authorizations.yml    |   12 +++
 services/api/test/fixtures/collections.yml         |    9 ++
 services/api/test/fixtures/groups.yml              |    5 +
 services/api/test/fixtures/links.yml               |   79 +++++++++++++++++++
 services/api/test/fixtures/users.yml               |   22 +++++-
 .../arvados/v1/user_agreements_controller_test.rb  |   46 +++++++++++
 .../functional/arvados/v1/users_controller_test.rb |   41 ++++++++++
 services/api/test/test_helper.rb                   |    3 +
 28 files changed, 506 insertions(+), 10 deletions(-)
 copy apps/workbench/app/assets/javascripts/{api_client_authorizations.js.coffee => user_agreements.js.coffee} (100%)
 copy apps/workbench/app/assets/stylesheets/{virtual_machines.css.scss => user_agreements.css.scss} (65%)
 create mode 100644 apps/workbench/app/controllers/user_agreements_controller.rb
 create mode 100644 apps/workbench/app/helpers/user_agreements_helper.rb
 create mode 100644 apps/workbench/app/models/user_agreement.rb
 create mode 100644 apps/workbench/app/views/user_agreements/index.html.erb
 create mode 100644 apps/workbench/test/functional/user_agreements_controller_test.rb
 create mode 100644 apps/workbench/test/unit/helpers/user_agreements_helper_test.rb
 copy apps/workbench/test/unit/{group_test.rb => user_agreement_test.rb} (60%)
 create mode 100644 services/api/app/controllers/arvados/v1/user_agreements_controller.rb
 create mode 100644 services/api/app/models/user_agreement.rb
 create mode 100644 services/api/test/fixtures/collections.yml
 create mode 100644 services/api/test/fixtures/links.yml
 create mode 100644 services/api/test/functional/arvados/v1/user_agreements_controller_test.rb
 create mode 100644 services/api/test/functional/arvados/v1/users_controller_test.rb

       via  385f300ba44bc186aa679d5aba543260e8ffee1e (commit)
       via  d8f04c6a53487419fd256e31ec4da3b0a3056b12 (commit)
       via  8cad6cfa7495231768347535835efa96166f8f79 (commit)
       via  ecdb71755fe9b30efc5aa6a51489210f859165af (commit)
       via  ac7faac8ededb8df5c708180726686f9780184f6 (commit)
       via  b588c254853ab654a685669c36b21e05154b6571 (commit)
      from  b973b188a9719d3b05d7c639b22544a18288c0f4 (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 385f300ba44bc186aa679d5aba543260e8ffee1e
Merge: b973b18 d8f04c6
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Dec 30 15:17:17 2013 -0800

    Merge branch '1694-user-agreement'


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


hooks/post-receive
--