Commit 18410974 authored by Etienne Baqué's avatar Etienne Baqué

Merge branch '235479-actioncontroller-respondtomismatcherror-in-wiki-controller' into 'master'

Resolve "ActionController::RespondToMismatchError in wiki controller"

See merge request gitlab-org/gitlab!56288
parents 71636fca 86b7b91b
......@@ -207,13 +207,13 @@ class ApplicationController < ActionController::Base
end
respond_to do |format|
format.any { head status }
format.html do
render template,
layout: "errors",
status: status,
locals: { message: message }
end
format.any { head status }
end
end
......@@ -223,8 +223,8 @@ class ApplicationController < ActionController::Base
def render_403
respond_to do |format|
format.any { head :forbidden }
format.html { render "errors/access_denied", layout: "errors", status: :forbidden }
format.any { head :forbidden }
end
end
......
---
title: Return an HTML response for a request with the Accept */* header
merge_request: 56288
author:
type: fixed
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