Merge branch '8784-dir-listings'

[arvados.git] / services / api / app / views / admin_notifier / new_user.text.erb

diff --git a/services/api/app/views/admin_notifier/new_user.text.erb b/services/api/app/views/admin_notifier/new_user.text.erb
index 374e46efacbe26db58c7dd75af06868d846708d5..d21513f7f02e44495070bf84225ede0b0bda7e1d 100644 (file)
--- a/services/api/app/views/admin_notifier/new_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_user.text.erb
@@ -1,14 +1,23 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
 
-A new user has been created:
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<%
+  add_to_message = ''
+  if Rails.configuration.auto_setup_new_users
+    add_to_message = @user.is_invited ? ' and setup' : ', but not setup'
+  end
+%>
+A new user has been created<%=add_to_message%>:
 
   <%= @user.full_name %> <<%= @user.email %>>
 
 This user is <%= @user.is_active ? '' : 'NOT ' %>active.
 
-<% if not @wb_address.empty? -%>
+<% if Rails.configuration.workbench_address -%>
 Please see workbench for more information:
 
-  <%= @wb_address %>
+  <%= Rails.configuration.workbench_address %>
 
 <% end -%>
 Thanks,