[ARVADOS] updated: d0c85cb89af65eff3e629fa3d475a289e289cff7

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/user_agreements.js      |  16 +-
 .../app/controllers/user_agreements_controller.rb  |   6 +
 .../app/views/user_agreements/index.html.erb       |  14 +-
 .../functional/user_agreements_controller_test.rb  |  12 ++
 .../test/integration/user_agreements_test.rb       |  29 +++
 .../app/controllers/user_sessions_controller.rb    |   3 +
 services/api/app/mailers/admin_notifier.rb         |   8 +-
 services/api/app/models/user.rb                    |  42 ++++
 .../api/app/views/admin_notifier/new_user.text.erb |   9 +-
 services/api/config/application.default.yml        |  12 ++
 services/api/db/structure.sql                      |   1 -
 services/api/test/fixtures/links.yml               |  14 ++
 services/api/test/fixtures/repositories.yml        |   5 +
 .../functional/arvados/v1/links_controller_test.rb |   2 +-
 .../functional/arvados/v1/users_controller_test.rb |  19 +-
 .../api/test/integration/user_sessions_test.rb     |  86 +++++++-
 services/api/test/test_helper.rb                   |   6 +
 services/api/test/unit/user_test.rb                | 223 ++++++++++++++++++---
 18 files changed, 453 insertions(+), 54 deletions(-)
 create mode 100644 apps/workbench/test/integration/user_agreements_test.rb

       via  d0c85cb89af65eff3e629fa3d475a289e289cff7 (commit)
       via  1ee96f5e647a85cf2c1040ae04b83fb6ece4372b (commit)
       via  df706aa32d45a14fc20c7dc84e8934875742f28f (commit)
       via  d36525cf0f67b35e9f59a3481a3739f9ebffae29 (commit)
       via  2ba51ef35957ceb5c56ec9cbd0a03b12b17a5c48 (commit)
       via  a77dee1d10e7e852565370ff552632f718302fd6 (commit)
       via  3c0133882412d8dca41ccd016eedb477d6df3430 (commit)
       via  12dd86319a1c6fb88fbe1530dc59e6172d448337 (commit)
       via  b9020f2936407786a829bfd5c47066d74e0041d4 (commit)
       via  9bb0d7674485783477d428f0deafeb3eb2324305 (commit)
       via  a39032f95b14448950792600cf27aa67a582674c (commit)
       via  523627b6ac01c84afbc7b08976f76820a71c4d37 (commit)
       via  33b9b5e6b376194ea68e628ab74256274172d130 (commit)
       via  38f75fbc29cd41cd0fd79756a70c254f2eea7fb5 (commit)
       via  195c34017a79a081b7ad666935fb2d4aaab96c14 (commit)
       via  c808c34df9a699491f745f5666b787788a649a16 (commit)
       via  d9cfb1a387937e93cd9c194273c1f03da4664b4d (commit)
       via  9624ed0931aac929f0d773dfee8b9e620b9352ad (commit)
       via  c005c5ab76492b844e84d1c66f75797bd98d0996 (commit)
       via  ce9c2266d5267937d25562824df3ccf4d4d7fe7c (commit)
       via  562a420a512bf9ae5fdfb1b564092dc3a011cbcd (commit)
       via  c5ec75eed7fec3fcb70031d684acfc7532ba9996 (commit)
       via  1f438358f952fe296bd6aebaa1f868ddb366fb7e (commit)
       via  0a658f812d1db5fed5ab9da8fd0b77fd57a33532 (commit)
       via  1e30d46f1d678ca297ed3d9a1d5833cd59e27c84 (commit)
       via  7153f88758f73a339673b399cd43dceae8c86e4f (commit)
       via  953f5e01dfae91bc0991d7fc4f116106691440e5 (commit)
       via  347d974ab2a8e7eecf1f3edc472e03223b0ad1bf (commit)
       via  518d15a56c986752b73dab316495e7e3d04739a6 (commit)
       via  a44040a0cb9948b42b72cbd3598e2af86e1864d2 (commit)
       via  78b4e097593088a9c3614bf922a13e7eb454ea06 (commit)
       via  01463a6fad519def1d3558ddb9c518a605fc9cc2 (commit)
       via  171cb08d6143cd567a53664d17bba55482adbd5d (commit)
      from  661d0cfaa7f958d17e8bdc76e87a17ca6d4b8258 (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 d0c85cb89af65eff3e629fa3d475a289e289cff7
Merge: 661d0cf 1ee96f5
Author: radhika <radhika at curoverse.com>
Date:   Sun Aug 24 18:55:51 2014 -0400

    Merge branch 'master' into 3112-report-bug
    
    Conflicts:
    	services/api/config/application.default.yml

diff --cc services/api/config/application.default.yml
index bd877f6,fb19dbc..f836a66
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@@ -181,6 -182,12 +183,16 @@@ common
    # email address to which mail should be sent when the user creates profile for the first time
    user_profile_notification_address: false
  
+   default_openid_prefix: https://www.google.com/accounts/o8/id
+ 
+   # Config parameters to automatically setup new users.
+   # The params auto_setup_new_users_with_* are meaningful only when auto_setup_new_users is turned on.
+   # auto_setup_name_blacklist is a list of usernames to be blacklisted for auto setup.
+   auto_setup_new_users: false
+   auto_setup_new_users_with_vm_uuid: false
+   auto_setup_new_users_with_repository: false
+   auto_setup_name_blacklist: [arvados, git, gitolite, gitolite-admin, root, syslog]
++
 +  # source_version
 +  source_version: <%= `git log -n 1 --format=%h` %>
 +  local_modified: false

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


hooks/post-receive
--