diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-01 09:51:51 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-01 09:51:51 -0800 |
| commit | c2897901de4266e5c02da6cc5a9348bfde13552e (patch) | |
| tree | 6efe811c1c6e074fcac0daae63b9d9bf7634e995 /activemodel/lib/active_model/version.rb | |
| parent | 5bb5780f7b2015f3f948f39e0151198591757056 (diff) | |
| parent | 01b470f526922ad3fc5562a237d11d45347befa9 (diff) | |
| download | rails-c2897901de4266e5c02da6cc5a9348bfde13552e.tar.gz rails-c2897901de4266e5c02da6cc5a9348bfde13552e.tar.bz2 rails-c2897901de4266e5c02da6cc5a9348bfde13552e.zip | |
Merge branch '3-2-2' into 3-2-stable
* 3-2-2:
bumping to 3.2.2
Ensure [] respects the status of the buffer.
Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
Merge pull request #5084 from johndouthat/patch-1
updating RAILS_VERSION
delete vulnerable AS::SafeBuffer#[]
use AS::SafeBuffer#clone_empty for flushing the output_buffer
add AS::SafeBuffer#clone_empty
fix output safety issue with select options
Diffstat (limited to 'activemodel/lib/active_model/version.rb')
| -rw-r--r-- | activemodel/lib/active_model/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb index 91b566c434..3d2cbf0de4 100644 --- a/activemodel/lib/active_model/version.rb +++ b/activemodel/lib/active_model/version.rb @@ -2,7 +2,7 @@ module ActiveModel module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 1 + TINY = 2 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |