[ARVADOS] updated: aa2adbcaa06c4f5dc7a6e54f3d9a5148b20fbbb1

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/user_agreements.js      |  9 ++++
 .../app/assets/stylesheets/application.css.scss    |  4 --
 .../app/controllers/application_controller.rb      | 42 ++++++++----------
 .../app/controllers/collections_controller.rb      |  3 +-
 apps/workbench/app/controllers/users_controller.rb | 18 ++++++--
 .../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    |  4 +-
 .../workbench/test/integration/collections_test.rb | 24 +++++------
 services/api/app/models/user.rb                    | 50 ++++++++--------------
 .../functional/arvados/v1/users_controller_test.rb |  8 ++++
 17 files changed, 126 insertions(+), 127 deletions(-)
 create mode 100644 apps/workbench/app/assets/javascripts/user_agreements.js

       via  aa2adbcaa06c4f5dc7a6e54f3d9a5148b20fbbb1 (commit)
       via  f6634dddac1489a463a5eba713a0908a9c72e212 (commit)
       via  5b43256cd7462b92ed91bceaa1c864c1db2d400a (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)
      from  accaf5ae43696ec8462e0f204a41125e14cefbc0 (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 aa2adbcaa06c4f5dc7a6e54f3d9a5148b20fbbb1
Merge: accaf5a f6634dd
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Aug 18 14:17:49 2014 -0400

    Merge branch '3604-theme-and-new-user-process' closes #3604


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


hooks/post-receive
--