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 | |
| 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
| -rw-r--r-- | RAILS_VERSION | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/tag_helper.rb | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/version.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 | ||||
| -rw-r--r-- | version.rb | 2 |
10 files changed, 10 insertions, 9 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION index f05e43bdbc..7c0a2fe0e5 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -3.2.22.3 +3.2.22.4 diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 669b5851da..78239635c0 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -3,7 +3,7 @@ module ActionMailer MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 9c08a5d9a6..13fe68c69a 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -3,7 +3,7 @@ module ActionPack MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end 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 diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index b6a041f964..00427eb804 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -3,7 +3,7 @@ module ActiveModel MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 7cfe3fff79..c5740919d6 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module ActiveRecord MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index e8b791bb60..85843d4be9 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module ActiveResource MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index 17b1993ed9..4204e522da 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -3,7 +3,7 @@ module ActiveSupport MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index f0b4234780..3336ea24f5 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/version.rb b/version.rb index f0b4234780..3336ea24f5 100644 --- a/version.rb +++ b/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |