Merge branch '21666-provision-test-improvement'

[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 9fc8f11caa030556c83b1e6a48d38f4b1542afb9..920906d83367878473ac1a60ae250ccd8f442ae5 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,15 +1,18 @@
-A new user has been created<%=' and setup' if Rails.configuration.auto_setup_new_users %>:
+<%# Copyright (C) The Arvados Authors. All rights reserved.
 
-  <%= @user.full_name %> <<%= @user.email %>>
+SPDX-License-Identifier: AGPL-3.0 %>
 
-This user is <%= @user.is_active ? '' : 'NOT ' %>active.
+A new user has been created and set up.
 
-<% if not @wb_address.empty? -%>
-Please see workbench for more information:
+  <%= @user.full_name %> <<%= @user.email %>> (<%= @user.username %>)
 
-  <%= @wb_address %>
+They are able to use Arvados.
+
+<% if Rails.configuration.Services.Workbench1.ExternalURL -%>
+Please see Workbench for more information:
+
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,
 Your friendly Arvados robot.
-