Merge branch 'render-text-deprecated' into 'master'

Fix deprecation: render :text is deprecated because it does not actually render…

See merge request gitlab-org/gitlab-ce!23425

7 files changed, 19 insertions, 13 deletions

diff --git a/app/controllers/admin/requests_profiles_controller.rb b/app/controllers/admin/requests_profiles_controller.rb
index 64d74ae4231..57f7d3e3951 100644
--- a/app/controllers/admin/requests_profiles_controller.rb
+++ b/app/controllers/admin/requests_profiles_controller.rb
@@ -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
diff --git a/app/controllers/chaos_controller.rb b/app/controllers/chaos_controller.rb
index b4f46cddbe9..8d518c14b90 100644
--- a/app/controllers/chaos_controller.rb
+++ b/app/controllers/chaos_controller.rb
@@ -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
diff --git a/app/controllers/metrics_controller.rb b/app/controllers/metrics_controller.rb
index 7353be478e1..c2089a0fca3 100644
--- a/app/controllers/metrics_controller.rb
+++ b/app/controllers/metrics_controller.rb
@@ -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
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 912421e3d08..dcee8eb7e6e 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -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
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index de10783df1a..e940f382a19 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -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
 
diff --git a/changelogs/unreleased/render-text-deprecated.yml b/changelogs/unreleased/render-text-deprecated.yml
new file mode 100644
index 00000000000..7dbbd13bcef
--- /dev/null
+++ b/changelogs/unreleased/render-text-deprecated.yml
@@ -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
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 1b585bcd4c6..ac92b2ca657 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -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)