aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/version.rb4
-rw-r--r--activesupport/test/core_ext/range_ext_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index ef2c69e695..3ba71473c3 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -2,8 +2,8 @@ module ActiveSupport
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 1
- PRE = nil
+ TINY = 2
+ PRE = "rc1"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index f9fb4f833a..360c97031c 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -54,7 +54,7 @@ class RangeTest < Test::Unit::TestCase
end
def test_should_include_identical_exclusive_with_floats
- assert (1.0...10.0).include?(1.0...10.0)
+ assert((1.0...10.0).include?(1.0...10.0))
end
def test_blockless_step