aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-12-03 11:16:54 +0100
committerGitHub <noreply@github.com>2016-12-03 11:16:54 +0100
commit66076f381aad7383568bf28ae1279b0bc570319c (patch)
treecc86a725f7dafef4c52a065e75273d20dda8e97a /actionview
parent26ea54aa7d1b0be66d5b99cab6e2f64c80fe4757 (diff)
parentd71f289fb29d7818620725346ed42ea6952708fa (diff)
downloadrails-66076f381aad7383568bf28ae1279b0bc570319c.tar.gz
rails-66076f381aad7383568bf28ae1279b0bc570319c.tar.bz2
rails-66076f381aad7383568bf28ae1279b0bc570319c.zip
Merge pull request #27258 from y-yagi/stop_using_removed_render_text
stop using removed `render :text`
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/ujs/server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb
index c7698c87fa..cc02cd8419 100644
--- a/actionview/test/ujs/server.rb
+++ b/actionview/test/ujs/server.rb
@@ -96,7 +96,7 @@ class TestsController < ActionController::Base
render html: html.html_safe
else
- render text: "ERROR: #{request.path} requested without ajax", status: 404
+ render plain: "ERROR: #{request.path} requested without ajax", status: 404
end
end
end