Commit 842b7baf authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'rails5-ee-deprecation-render-nothing' into 'master'

Rails5 deprecation: render :nothing option is deprecated, Use head method to respond with empty response body.

See merge request gitlab-org/gitlab-ee!8560
parents f4c13856 273c5c12
...@@ -93,7 +93,7 @@ class Projects::ManagedLicensesController < Projects::ApplicationController ...@@ -93,7 +93,7 @@ class Projects::ManagedLicensesController < Projects::ApplicationController
end end
def render_ok def render_ok
render status: :ok, nothing: true head :ok
end end
def render_software_license_policy def render_software_license_policy
......
---
title: render :nothing option is deprecated, Use head method to respond with empty
response body.
merge_request: 8560
author: Jasper Maes
type: other
...@@ -13,7 +13,7 @@ describe EE::ProjectUnauthorized do ...@@ -13,7 +13,7 @@ describe EE::ProjectUnauthorized do
describe '#project_unauthorized_proc' do describe '#project_unauthorized_proc' do
controller(::Projects::ApplicationController) do controller(::Projects::ApplicationController) do
def show def show
render nothing: true head :ok
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