[arvados] updated: 2.7.0-5614-gc821bfc602

[git repository hosting]

Summary of changes:
 services/api/app/views/admin_notifier/new_inactive_user.text.erb | 4 ++--
 services/api/app/views/admin_notifier/new_user.text.erb          | 2 +-
 services/api/test/integration/remote_user_test.rb                | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

       via  c821bfc6028b78d5272d7721541dae64c828bdbc (commit)
      from  434ef5225b3d505ddeceb81815c6e8d454555772 (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 c821bfc6028b78d5272d7721541dae64c828bdbc
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Tue Jan 2 09:56:14 2024 -0500

    21059: Fix "Arvado" typo.  Use URI::join.
    
    Also delete some commented-out debug code.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/api/app/views/admin_notifier/new_inactive_user.text.erb b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
index 8a002fe172..22298b1ce7 100644
--- a/services/api/app/views/admin_notifier/new_inactive_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
@@ -6,12 +6,12 @@ A new user has been created, but not set up.
 
   <%= @user.full_name %> <<%= @user.email %>> (<%= @user.username %>)
 
-They will not be able to use Arvado unless set up by an admin.
+They will not be able to use Arvados unless set up by an admin.
 
 <% if Rails.configuration.Services.Workbench1.ExternalURL -%>
 Please see Workbench for more information:
 
-  <%= Rails.configuration.Services.Workbench1.ExternalURL %>user/<%=@user.uuid%>
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,
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 f62094b4eb..920906d833 100644
--- a/services/api/app/views/admin_notifier/new_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_user.text.erb
@@ -11,7 +11,7 @@ They are able to use Arvados.
 <% if Rails.configuration.Services.Workbench1.ExternalURL -%>
 Please see Workbench for more information:
 
-  <%= Rails.configuration.Services.Workbench1.ExternalURL %>user/<%=@user.uuid%>
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,
diff --git a/services/api/test/integration/remote_user_test.rb b/services/api/test/integration/remote_user_test.rb
index df1a225970..f42fda4150 100644
--- a/services/api/test/integration/remote_user_test.rb
+++ b/services/api/test/integration/remote_user_test.rb
@@ -385,10 +385,6 @@ class RemoteUsersTest < ActionDispatch::IntegrationTest
     assert_equal 'foo at example.com', json_response['email']
     assert_equal 'barney', json_response['username']
 
-    # ActionMailer::Base.deliveries.each do |d|
-    #   puts "--- delivery #{d.inspect} #{d.body}"
-    # end
-
     assert_equal 2, ActionMailer::Base.deliveries.length
     assert_equal "Welcome to Arvados - account enabled", ActionMailer::Base.deliveries[0].subject
     assert_equal "[ARVADOS] New user created notification", ActionMailer::Base.deliveries[1].subject

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


hooks/post-receive
--