[ARVADOS] updated: 1.3.0-889-gd8622da31

[Git user]

Summary of changes:
 services/api/app/views/user_sessions/create.html.erb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

       via  d8622da3183d2028b052e5c622635b96b6d4aa23 (commit)
      from  6bb345e5958f905e0527facdc5b08d973a535f3a (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 d8622da3183d2028b052e5c622635b96b6d4aa23
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri May 17 10:18:13 2019 -0400

    Add user email and cancel button to federated user redirect page
    
    refs #15061
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/views/user_sessions/create.html.erb b/services/api/app/views/user_sessions/create.html.erb
index 2cb694818..545c3e514 100644
--- a/services/api/app/views/user_sessions/create.html.erb
+++ b/services/api/app/views/user_sessions/create.html.erb
@@ -1,7 +1,13 @@
-<div style="width:30em; margin:2em auto 0 auto">
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
+<div style="width:40em; margin:2em auto 0 auto">
   <h1>Login redirect</h1>
-  <p>This login is linked to federated user <b><%= @user.uuid %></b> on cluster <b><%= @user.uuid[0..4] %></b>.</p>
-  <p><a href="<%=@remotehomeurl%>">Click here log in on cluster <%= @user.uuid[0..4] %>.</a></p>
-  <p>After logging in, you will be returned to this cluster (<%=Rails.configuration.ClusterID%>).</p>
-  <p>To avoid seeing this page, choose <b><%= @user.uuid[0..4] %></b> as the cluster that hosts your user account on the Workbench login page.</p>
+  <p>This login is linked to federated user <b><%= @user.email %></b> (<b><%= @user.uuid %></b>) on cluster <b><%= @user.uuid[0..4] %></b>.  You need to log in again on that cluster.</p>
+  <p>After logging in, you will be returned to this cluster (<b><%=Rails.configuration.ClusterID%></b>).</p>
+  <div style="width: 100%">
+    <div style="float: left"><a href="<%=@remotehomeurl%>">Click here log in on cluster <%= @user.uuid[0..4] %>.</a></div>
+    <div style="float: right"><a href="/logout">Cancel</a></div>
+  </div>
 </div>

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


hooks/post-receive
--