aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application_controller.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-08-06 11:25:11 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-08-06 11:25:11 -0300
commitf052e4ae58c7f4dddc6604cde28e224e9b696664 (patch)
tree44d36a7bacf73147433345d41f3951c02b3a1fb2 /railties/lib/rails/application_controller.rb
parent3a4b4559ea7928772e60662036ae4dab88d187c7 (diff)
parent35a734d671b023cfe6a3298088bb18e009ad9bd7 (diff)
downloadrails-f052e4ae58c7f4dddc6604cde28e224e9b696664.tar.gz
rails-f052e4ae58c7f4dddc6604cde28e224e9b696664.tar.bz2
rails-f052e4ae58c7f4dddc6604cde28e224e9b696664.zip
Merge pull request #21137 from y-yagi/fix_deprecation_warning
stop using deprecated `render :text` in railties
Diffstat (limited to 'railties/lib/rails/application_controller.rb')
-rw-r--r--railties/lib/rails/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application_controller.rb b/railties/lib/rails/application_controller.rb
index 9a29ec21cf..618a09a5b3 100644
--- a/railties/lib/rails/application_controller.rb
+++ b/railties/lib/rails/application_controller.rb
@@ -6,7 +6,7 @@ class Rails::ApplicationController < ActionController::Base # :nodoc:
def require_local!
unless local_request?
- render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
+ render html: '<p>For security purposes, this information is only available to local requests.</p>'.html_safe, status: :forbidden
end
end