Merge remote-tracking branch 'upstream/pull/5007'

diff --cc app/views/application/_auth_providers.html.erb
index b7fb5ba4daaf7d52b75bf111100a5868d35327b0,487256cb0724feebc02f57b7a06c9419cf7bc961..f6665cefecae153f74a1e9192ad17031dc21b704
--- 1/app/views/application/_auth_providers.html.erb
--- 2/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@@ -29,10 -28,10 +29,10 @@@
    <% end %>
  
    <%# :tabindex starts high to allow rendering at the bottom of the template %>
 -  <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
 +  <%= form_tag auth_path(:provider => "openid"), :id => "openid_login_form", :class => "collapse" do %>
      <div class="mb-3">
        <label for="openid_url" class="form-label">
-         <%= image_tag "openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
+         <%= image_tag "auth_providers/openid.svg", :size => "36", :alt => "", :class => "align-text-bottom" %>
          <%= t ".openid_url" %>
        </label>
        <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>