[ARVADOS] updated: 1.3.0-2099-gee3897036

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/users_controller.rb | 6 +++++-
 services/api/app/mailers/user_notifier.rb                   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

       via  ee38970362aa72e8aeb875ce15028fffd7834a3b (commit)
      from  a1a1e1b9e28c470c8efb27ea290ba00d48c520f2 (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 ee38970362aa72e8aeb875ce15028fffd7834a3b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Jan 21 15:07:50 2020 -0500

    Allow user 'setup' to succeed even if email notification fails
    
    fixes #16051
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb
index 65a23f1fe..1cf3b9d78 100644
--- a/services/api/app/controllers/arvados/v1/users_controller.rb
+++ b/services/api/app/controllers/arvados/v1/users_controller.rb
@@ -121,7 +121,11 @@ class Arvados::V1::UsersController < ApplicationController
 
     # setup succeeded. send email to user
     if params[:send_notification_email]
-      UserNotifier.account_is_setup(@object).deliver_now
+      begin
+        UserNotifier.account_is_setup(@object).deliver_now
+      rescue => e
+        logger.warn "Failed to send email to #{@object.email}: #{e}"
+      end
     end
 
     send_json kind: "arvados#HashList", items: @response.as_api_response(nil)
diff --git a/services/api/app/mailers/user_notifier.rb b/services/api/app/mailers/user_notifier.rb
index 3d1b91f20..ad887d035 100644
--- a/services/api/app/mailers/user_notifier.rb
+++ b/services/api/app/mailers/user_notifier.rb
@@ -9,7 +9,7 @@ class UserNotifier < ActionMailer::Base
 
   def account_is_setup(user)
     @user = user
-    mail(to: user.email, subject: 'Welcome to Arvados - shell account enabled')
+    mail(to: user.email, subject: 'Welcome to Arvados - account enabled')
   end
 
 end

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


hooks/post-receive
--