Fix deprecation: render :text is deprecated because it does not actually render a text/plain response
This commit is contained in:
parent
a5f4627857
commit
1bb4ad9262
7 changed files with 19 additions and 13 deletions
|
@ -11,7 +11,7 @@ class Admin::RequestsProfilesController < Admin::ApplicationController
|
|||
profile = Gitlab::RequestProfiler::Profile.find(clean_name)
|
||||
|
||||
if profile
|
||||
render text: profile.content
|
||||
render html: profile.content
|
||||
else
|
||||
redirect_to admin_requests_profiles_path, alert: 'Profile not found'
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ class ChaosController < ActionController::Base
|
|||
duration_taken = (Time.now - start).seconds
|
||||
Kernel.sleep duration_s - duration_taken if duration_s > duration_taken
|
||||
|
||||
render text: "OK", content_type: 'text/plain'
|
||||
render plain: "OK"
|
||||
end
|
||||
|
||||
def cpuspin
|
||||
|
@ -24,14 +24,14 @@ class ChaosController < ActionController::Base
|
|||
|
||||
rand while Time.now < end_time
|
||||
|
||||
render text: "OK", content_type: 'text/plain'
|
||||
render plain: "OK"
|
||||
end
|
||||
|
||||
def sleep
|
||||
duration_s = (params[:duration_s]&.to_i || 30).seconds
|
||||
Kernel.sleep duration_s
|
||||
|
||||
render text: "OK", content_type: 'text/plain'
|
||||
render plain: "OK"
|
||||
end
|
||||
|
||||
def kill
|
||||
|
@ -44,13 +44,13 @@ class ChaosController < ActionController::Base
|
|||
secret = ENV['GITLAB_CHAOS_SECRET']
|
||||
# GITLAB_CHAOS_SECRET is required unless you're running in Development mode
|
||||
if !secret && !Rails.env.development?
|
||||
render text: "chaos misconfigured: please configure GITLAB_CHAOS_SECRET when using GITLAB_ENABLE_CHAOS_ENDPOINTS outside of a development environment", content_type: 'text/plain', status: 500
|
||||
render plain: "chaos misconfigured: please configure GITLAB_CHAOS_SECRET when using GITLAB_ENABLE_CHAOS_ENDPOINTS outside of a development environment", status: :internal_server_error
|
||||
end
|
||||
|
||||
return unless secret
|
||||
|
||||
unless request.headers["HTTP_X_CHAOS_SECRET"] == secret
|
||||
render text: "To experience chaos, please set X-Chaos-Secret header", content_type: 'text/plain', status: 401
|
||||
render plain: "To experience chaos, please set X-Chaos-Secret header", status: :unauthorized
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ class MetricsController < ActionController::Base
|
|||
"# Metrics are disabled, see: #{help_page}\n"
|
||||
end
|
||||
|
||||
render text: response, content_type: 'text/plain; version=0.0.4'
|
||||
render plain: response, content_type: 'text/plain; version=0.0.4'
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -41,12 +41,12 @@ class Profiles::KeysController < Profiles::ApplicationController
|
|||
user = UserFinder.new(params[:username]).find_by_username
|
||||
if user.present?
|
||||
headers['Content-Disposition'] = 'attachment'
|
||||
render text: user.all_ssh_keys.join("\n"), content_type: 'text/plain'
|
||||
render plain: user.all_ssh_keys.join("\n")
|
||||
else
|
||||
return render_404
|
||||
end
|
||||
rescue => e
|
||||
render text: e.message
|
||||
render html: e.message
|
||||
end
|
||||
else
|
||||
return render_404
|
||||
|
|
|
@ -122,7 +122,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
|||
set_workhorse_internal_api_content_type
|
||||
render json: Gitlab::Workhorse.terminal_websocket(terminal)
|
||||
else
|
||||
render text: 'Not found', status: :not_found
|
||||
render html: 'Not found', status: :not_found
|
||||
end
|
||||
end
|
||||
|
||||
|
|
6
changelogs/unreleased/render-text-deprecated.yml
Normal file
6
changelogs/unreleased/render-text-deprecated.yml
Normal file
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
title: 'Fix deprecation: render :text is deprecated because it does not actually render
|
||||
a text/plain response'
|
||||
merge_request: 23425
|
||||
author: Jasper Maes
|
||||
type: other
|
|
@ -114,7 +114,7 @@ describe ApplicationController do
|
|||
skip_before_action :authenticate_user!, only: :index
|
||||
|
||||
def index
|
||||
render text: 'authenticated'
|
||||
render html: 'authenticated'
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -401,7 +401,7 @@ describe ApplicationController do
|
|||
context 'terms' do
|
||||
controller(described_class) do
|
||||
def index
|
||||
render text: 'authenticated'
|
||||
render html: 'authenticated'
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -444,7 +444,7 @@ describe ApplicationController do
|
|||
attr_reader :last_payload
|
||||
|
||||
def index
|
||||
render text: 'authenticated'
|
||||
render html: 'authenticated'
|
||||
end
|
||||
|
||||
def append_info_to_payload(payload)
|
||||
|
|
Loading…
Reference in a new issue