Skip to content

Commit

Permalink
Merge be0957f into a3af289
Browse files Browse the repository at this point in the history
  • Loading branch information
gregschmit committed May 7, 2021
2 parents a3af289 + be0957f commit b090ad5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Empty file.
4 changes: 2 additions & 2 deletions lib/rest_framework/controller_mixins/base.rb
Expand Up @@ -182,9 +182,9 @@ def api_response(payload, html_kwargs: nil, **kwargs)
hkwargs = kwargs.merge(html_kwargs)
begin
render(**hkwargs)
rescue ActionView::MissingTemplate # fallback to rest_framework layout/view
rescue ActionView::MissingTemplate # fallback to rest_framework layout
hkwargs[:layout] = "rest_framework"
hkwargs[:template] = "rest_framework/default"
hkwargs[:html] = ''
render(**hkwargs)
end
}
Expand Down

0 comments on commit b090ad5

Please sign in to comment.