From: Ward Vandewege Date: Fri, 6 May 2022 12:47:11 +0000 (-0400) Subject: 18995: Merge branch 'main' into 18995-code-cleanup-5 X-Git-Tag: 2.5.0~186^2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/402d882ea36afbaff953e60594e470808ebf0579?hp=6bff9da1ce3a4348a3700ce83cc4215ded9a6b9c 18995: Merge branch 'main' into 18995-code-cleanup-5 Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/services/api/app/views/static/intro.html.erb b/services/api/app/views/static/intro.html.erb index 8bab0b2ac6..3e0b40794e 100644 --- a/services/api/app/views/static/intro.html.erb +++ b/services/api/app/views/static/intro.html.erb @@ -8,7 +8,7 @@ $(function(){ }); <% end %>
- +

Welcome

ARVADOS

diff --git a/services/api/app/views/static/login_failure.html.erb b/services/api/app/views/static/login_failure.html.erb index 6b81a33e87..d3f7111b5b 100644 --- a/services/api/app/views/static/login_failure.html.erb +++ b/services/api/app/views/static/login_failure.html.erb @@ -10,7 +10,7 @@ $(function(){
- +

Error