diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:54 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:25:54 -0700 |
| commit | d66fd081759af32e57baabf7888823cfd9bcebd0 (patch) | |
| tree | 85d312ba731c283be5bccd6343861dbad0023aac /railties | |
| parent | f8f6ad6ebc1602afa6af3c9cb297ea7896fb8b3a (diff) | |
| parent | dff6db18840e2fd1dd3f3e4ef0ae7a9a3986d01d (diff) | |
| download | rails-d66fd081759af32e57baabf7888823cfd9bcebd0.tar.gz rails-d66fd081759af32e57baabf7888823cfd9bcebd0.tar.bz2 rails-d66fd081759af32e57baabf7888823cfd9bcebd0.zip | |
Merge branch '3-2-stable-sec' into 3-2-stable
* 3-2-stable-sec:
Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
bumping to 3.2.4.rc1
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/version.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 4f960c58f6..698c8b8e4b 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,8 +2,8 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 3 - PRE = nil + TINY = 4 + PRE = "rc1" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |