aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-03-22 10:11:39 +1030
committerMatthew Draper <matthew@trebex.net>2017-03-22 10:11:39 +1030
commit6c08d480f13d3332c878ca8a120a03fcd78f7ba2 (patch)
treeade18a9203afbc55db46aee904a087e8d9cec3d0 /activesupport/lib/active_support
parent88b16843f67bcd96395444ba8f139895351da0bc (diff)
downloadrails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.tar.gz
rails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.tar.bz2
rails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.zip
Start Rails 5.2 development
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/deprecation.rb2
-rw-r--r--activesupport/lib/active_support/gem_version.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 191e582de8..c78ec67dc5 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -32,7 +32,7 @@ module ActiveSupport
# and the second is a library name
#
# ActiveSupport::Deprecation.new('2.0', 'MyLibrary')
- def initialize(deprecation_horizon = "5.2", gem_name = "Rails")
+ def initialize(deprecation_horizon = "5.3", gem_name = "Rails")
self.gem_name = gem_name
self.deprecation_horizon = deprecation_horizon
# By default, warnings are not silenced and debugging is off.
diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
index a641b96c57..371a39a5e6 100644
--- a/activesupport/lib/active_support/gem_version.rb
+++ b/activesupport/lib/active_support/gem_version.rb
@@ -6,9 +6,9 @@ module ActiveSupport
module VERSION
MAJOR = 5
- MINOR = 1
+ MINOR = 2
TINY = 0
- PRE = "beta1"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end