aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-02-11 10:19:31 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-02-11 10:19:31 -0800
commitf1efecfc3f009d7b25a0b72170914a2739cb3765 (patch)
tree15dae76219c41374722ba4a678db3c3743ae6994 /activesupport
parent62f01bec76f7e47a5d1dd14b34f5105885de5378 (diff)
parent1dccd44a5c74f20b0406ecc8d39373226f73af35 (diff)
downloadrails-f1efecfc3f009d7b25a0b72170914a2739cb3765.tar.gz
rails-f1efecfc3f009d7b25a0b72170914a2739cb3765.tar.bz2
rails-f1efecfc3f009d7b25a0b72170914a2739cb3765.zip
Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index e928403dd2..2230c5b78e 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -2,7 +2,7 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 11
+ TINY = 12
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')