Commit 909295c8 authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'issue_342492_application_controller' into 'master'

Pass formats explicitly when rendering .html file

See merge request gitlab-org/gitlab!76011
parents 84156e22 bcbf3501
...@@ -26,6 +26,9 @@ class OmniauthKerberosSpnegoController < ApplicationController ...@@ -26,6 +26,9 @@ class OmniauthKerberosSpnegoController < ApplicationController
# when the browser has given up. # when the browser has given up.
# #
headers['Www-Authenticate'] = spnego_challenge headers['Www-Authenticate'] = spnego_challenge
render 'errors/kerberos_denied.html.haml', layout: 'errors', status: :unauthorized render template: 'errors/kerberos_denied',
formats: :html,
locals: { layout: 'errors' },
status: :unauthorized
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment