[ARVADOS] updated: df706aa32d45a14fc20c7dc84e8934875742f28f

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/user_agreements.js      | 16 ++++++------
 .../app/controllers/user_agreements_controller.rb  |  6 +++++
 .../app/views/collections/_choose_rows.html.erb    |  9 ++++++-
 .../app/views/projects/_show_tab_contents.html.erb |  3 ++-
 .../app/views/user_agreements/index.html.erb       | 14 ++++++-----
 .../functional/user_agreements_controller_test.rb  | 12 +++++++++
 .../test/integration/user_agreements_test.rb       | 29 ++++++++++++++++++++++
 .../app/controllers/arvados/v1/jobs_controller.rb  |  4 +--
 services/api/app/models/commit.rb                  | 15 ++++++++---
 services/api/test/fixtures/links.yml               |  6 ++---
 10 files changed, 88 insertions(+), 26 deletions(-)
 create mode 100644 apps/workbench/test/integration/user_agreements_test.rb

       via  df706aa32d45a14fc20c7dc84e8934875742f28f (commit)
       via  2ba51ef35957ceb5c56ec9cbd0a03b12b17a5c48 (commit)
       via  a77dee1d10e7e852565370ff552632f718302fd6 (commit)
       via  3c0133882412d8dca41ccd016eedb477d6df3430 (commit)
       via  12dd86319a1c6fb88fbe1530dc59e6172d448337 (commit)
       via  d68db5e4755eb38482f251fec92fa975feae667d (commit)
       via  db88e7487f1fca50e00c5fc004e67b922a41ad29 (commit)
       via  b6487d6773406f0da6724e24ad5ce6a94e1009cd (commit)
       via  44064fd5fd15cf053603276438d19941f3d8e892 (commit)
       via  d85ec3b1d45863839186537c6c832732784d5689 (commit)
       via  82b77ceb5b9fa5035fc44372fb090769e61adba0 (commit)
      from  b9020f2936407786a829bfd5c47066d74e0041d4 (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 df706aa32d45a14fc20c7dc84e8934875742f28f
Author: radhika <radhika at curoverse.com>
Date:   Sun Aug 24 18:06:10 2014 -0400

    3153: update the newly added vm login link to not point to the "active" user

diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index dc044b2..abeab28 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -710,12 +710,12 @@ empty_collection_name_in_active_user_home_project:
 
 auto_setup_vm_login_username_can_login_to_test_vm:
   uuid: zzzzz-o0j2j-i3n6m98766tmoi4
-  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  owner_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
   created_at: 2014-08-06 22:11:51.242392533 Z
   modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
-  modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  modified_by_user_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
   modified_at: 2014-08-06 22:11:51.242150425 Z
-  tail_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  tail_uuid: zzzzz-tpzed-xabcdjxw79nv3jz
   link_class: permission
   name: can_login
   head_uuid: zzzzz-2x53u-382brsig8rp3064

commit 2ba51ef35957ceb5c56ec9cbd0a03b12b17a5c48
Merge: 12dd863 a77dee1
Author: radhika <radhika at curoverse.com>
Date:   Sun Aug 24 17:14:32 2014 -0400

    Merge branch 'master' into 3153-auto-setup-user


commit 12dd86319a1c6fb88fbe1530dc59e6172d448337
Merge: b9020f2 d68db5e
Author: radhika <radhika at curoverse.com>
Date:   Sat Aug 23 18:22:19 2014 -0400

    Merge branch 'master' into 3153-auto-setup-user


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


hooks/post-receive
--