[arvados] updated: 2.1.0-3214-g0f78f8e59

[git repository hosting]

Summary of changes:
 apps/workbench/app/models/arvados_api_client.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

       via  0f78f8e5951c90752f9e971521c7d815aa62898f (commit)
      from  9446f96840126285dcdda931abbd8a3ca4d9c77f (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 0f78f8e5951c90752f9e971521c7d815aa62898f
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Dec 16 16:53:02 2022 -0500

    19880: Fix tests by restoring test hook
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 25a4e74b7..2abcf49e5 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -235,6 +235,13 @@ class ArvadosApiClient
   end
 
   def arvados_login_url(params={})
+    if Rails.configuration.testing_override_login_url
+      uri = URI(Rails.configuration.testing_override_login_url)
+      uri.path = "/login"
+      uri.query = URI.encode_www_form(params)
+      return uri.to_s
+    end
+
     case
     when Rails.configuration.Login.PAM.Enable,
          Rails.configuration.Login.LDAP.Enable,
@@ -245,9 +252,6 @@ class ArvadosApiClient
       uri.query = URI.encode_www_form(params)
     else
       uri = URI.parse(Rails.configuration.Services.Controller.ExternalURL.to_s)
-      if Rails.configuration.testing_override_login_url
-        uri = URI(Rails.configuration.testing_override_login_url)
-      end
       uri.path = "/login"
       uri.query = URI.encode_www_form(params)
     end

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


hooks/post-receive
--