aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-07-12 14:51:01 -0400
committerGitHub <noreply@github.com>2018-07-12 14:51:01 -0400
commitac2ada3e00247c1525257b8d56b2e8660d586f11 (patch)
tree72d361b32403fad785ef4e907e4c215ddef41428
parentfd132d0dad969b9f05be7eb06b263dab211634f3 (diff)
parent4eb9c01e394605c4564ea49a125f466f8fbdfe5f (diff)
downloadrails-ac2ada3e00247c1525257b8d56b2e8660d586f11.tar.gz
rails-ac2ada3e00247c1525257b8d56b2e8660d586f11.tar.bz2
rails-ac2ada3e00247c1525257b8d56b2e8660d586f11.zip
Merge pull request #33340 from ttanimichi/patch-1
[ci skip] `sanitizer_vendor` will be removed in Rails 6
-rw-r--r--actionview/lib/action_view/helpers/sanitize_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/sanitize_helper.rb b/actionview/lib/action_view/helpers/sanitize_helper.rb
index 275a2dffb4..cb0c99c4cf 100644
--- a/actionview/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionview/lib/action_view/helpers/sanitize_helper.rb
@@ -126,7 +126,7 @@ module ActionView
attr_writer :full_sanitizer, :link_sanitizer, :white_list_sanitizer
# Vendors the full, link and white list sanitizers.
- # Provided strictly for compatibility and can be removed in Rails 5.1.
+ # Provided strictly for compatibility and can be removed in Rails 6.
def sanitizer_vendor
Rails::Html::Sanitizer
end