diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 12:20:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 12:20:20 -0700 |
| commit | fecc67d5152576eb9d918f6a2b90851e8fd6a23c (patch) | |
| tree | 3053f3080d1a2aeeddc7b764b373e46a9e2ee9db /actionpack/lib/action_view/helpers/tag_helper.rb | |
| parent | 5efc4ec4d997cb5f491a7dd79dd94779d08cf80d (diff) | |
| parent | c4e01690620c319ac3f04d213003f8001f33d14b (diff) | |
| download | rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.tar.gz rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.tar.bz2 rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.zip | |
Merge branch '3-2-22-3' into 3-2-stable
* 3-2-22-3:
bumping version
Include missing module in tag_helper
Diffstat (limited to 'actionpack/lib/action_view/helpers/tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb index 34741b8d79..6b659a7c00 100644 --- a/actionpack/lib/action_view/helpers/tag_helper.rb +++ b/actionpack/lib/action_view/helpers/tag_helper.rb @@ -10,6 +10,7 @@ module ActionView module TagHelper extend ActiveSupport::Concern include CaptureHelper + include OutputSafetyHelper BOOLEAN_ATTRIBUTES = %w(disabled readonly multiple checked autobuffer autoplay controls loop selected hidden scoped async |