[ARVADOS] created: 1.3.0-968-g390c01992
Git user
git at public.curoverse.com
Mon Jun 3 19:29:04 UTC 2019
at 390c01992d568d3f0de5e3537db93592de9947d9 (commit)
commit 390c01992d568d3f0de5e3537db93592de9947d9
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Mon Jun 3 15:14:37 2019 -0400
Do not blow up when Rails.configuration.Users.UserProfileNotificationAddress is
set to the empty string, which is the default since #13996 (it defaulted to a
dummy e-mail adress before).
refs #15286
refs #13996
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 989a97592..fc5ae0a49 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -580,7 +580,7 @@ class User < ArvadosModel
if self.prefs_changed?
if self.prefs_was.andand.empty? || !self.prefs_was.andand['profile']
profile_notification_address = Rails.configuration.Users.UserProfileNotificationAddress
- ProfileNotifier.profile_created(self, profile_notification_address).deliver_now if profile_notification_address
+ ProfileNotifier.profile_created(self, profile_notification_address).deliver_now if profile_notification_address and !profile_notification_address.empty?
end
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list