[ARVADOS] updated: 1.1.4-278-g86138c1

[Git user]

Summary of changes:
 apps/workbench/app/views/users/link_account.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  86138c185241b1a6c74dc83497293ef3e8abb6eb (commit)
      from  6237a718e292de02dc06c2885e4a96260616ce03 (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 86138c185241b1a6c74dc83497293ef3e8abb6eb
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri May 18 16:57:21 2018 -0400

    12995: Do nested logout/login to workaround SSO session.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/views/users/link_account.html.erb b/apps/workbench/app/views/users/link_account.html.erb
index a0fb41b..0fd8fb6 100644
--- a/apps/workbench/app/views/users/link_account.html.erb
+++ b/apps/workbench/app/views/users/link_account.html.erb
@@ -58,7 +58,7 @@
     sessionStorage.setItem('link_account_created_at', '<%= Thread.current[:user].created_at %>');
     sessionStorage.setItem('link_account_is_active', <%= if Thread.current[:user].is_active then "true" else "false" end %>);
     sessionStorage.setItem('link_account_is_admin', <%= if Thread.current[:user].is_admin then "true" else "false" end %>);
-    window.location.replace('<%=arvados_api_client.arvados_login_url(return_to: "#{strip_token_from_path(request.url)}?direction=")%>'+dir);
+    window.location.replace('<%=arvados_api_client.arvados_logout_url(return_to: arvados_api_client.arvados_login_url(return_to: "#{strip_token_from_path(request.url)}?direction="))%>'+dir);
   }
 
   $(document).on("click", "#link-account-in", function(e) { do_login("in"); });

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


hooks/post-receive
--