aboutsummaryrefslogtreecommitdiffstats
path: root/RAILS_VERSION
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-01 09:51:51 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-01 09:51:51 -0800
commitc2897901de4266e5c02da6cc5a9348bfde13552e (patch)
tree6efe811c1c6e074fcac0daae63b9d9bf7634e995 /RAILS_VERSION
parent5bb5780f7b2015f3f948f39e0151198591757056 (diff)
parent01b470f526922ad3fc5562a237d11d45347befa9 (diff)
downloadrails-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 'RAILS_VERSION')
-rw-r--r--RAILS_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION
index e4604e3afd..be94e6f53d 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.1
+3.2.2