[ARVADOS] updated: f6235f6bbe13b61b298d07bedb75ba645d69ed15

[git at public.curoverse.com]

Summary of changes:
 services/api/app/mailers/admin_notifier.rb         |  52 +++++-----
 services/api/app/models/user.rb                    |  10 +-
 .../admin_notifier/after_create_user.text.erb      |   7 --
 .../admin_notifier/new_inactive_user.text.erb      |  13 +++
 .../api/app/views/admin_notifier/new_user.text.erb |  16 ++++
 services/api/config/application.default.yml        |   2 +
 services/api/test/unit/user_test.rb                | 105 ++++++++++++++++-----
 7 files changed, 151 insertions(+), 54 deletions(-)
 delete mode 100644 services/api/app/views/admin_notifier/after_create_user.text.erb
 create mode 100644 services/api/app/views/admin_notifier/new_inactive_user.text.erb
 create mode 100644 services/api/app/views/admin_notifier/new_user.text.erb

       via  f6235f6bbe13b61b298d07bedb75ba645d69ed15 (commit)
       via  aa58b06d72a858fd63e091622a5bd8b3a9287e72 (commit)
       via  afd7a019bbeed1f194d6f4fbd2e190eae42ddb86 (commit)
       via  65be441066ac47f556b3a19872536b42b09c5e22 (commit)
       via  4609a76d9b84e0f63233cdf6dcbef376b1686b69 (commit)
       via  0c1c7fa2cba96aae542db0e6b6991c71d5ff578a (commit)
       via  e9fc734bb270a5648c923ed0419ff745e283419c (commit)
       via  e1868aea69f51b3fb3d281a0dcca66b9de239cfa (commit)
       via  c811cb98bce53f775a865a04ea0f01635dbe75f3 (commit)
       via  ebb166d65eb37f89edeccfc5be97014f3f2a73e2 (commit)
       via  1eee45ce0bbae9e7d04a9382469d2c48fb0cfd3e (commit)
       via  89851a28f3bd8dc05bb8efcab86fa42dda7e7fd2 (commit)
       via  6e0751ce5ea7332fc87e7836c24b6ccb49c399dc (commit)
       via  40cbd508756d5ec3935489fc67f5ada7423dc17f (commit)
       via  83a8512fad199107ff54762658a55176d479a5bb (commit)
      from  cce25fdb29b36ffa3348546da36cbd4d8bbfe4fc (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 f6235f6bbe13b61b298d07bedb75ba645d69ed15
Merge: cce25fd aa58b06
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Jun 2 15:17:44 2014 -0400

    Merge branch '2681-new-inactive-user-notification'
    
    refs #2681


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


hooks/post-receive
--