diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-31 17:03:03 -0700 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-05-31 17:03:03 -0700 |
commit | f9db7695fe3c148c8d1077f1564e5b94d126b83b (patch) | |
tree | 3f9d63095f88c0537a0f2e9865833f4010131dda /actionpack | |
parent | ef0ea782b1f5cf7b08e74ea3002a16c708f66645 (diff) | |
download | rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.tar.gz rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.tar.bz2 rails-f9db7695fe3c148c8d1077f1564e5b94d126b83b.zip |
Making ready for release of 2.1
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 4 | ||||
-rw-r--r-- | actionpack/Rakefile | 2 | ||||
-rw-r--r-- | actionpack/lib/action_pack/version.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 5c4bfbf3c9..cb684a925d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,6 @@ -* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing] +*2.1.0 (May 31st, 2008)* -*2.1.0 RC1 (May 11th, 2008)* +* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing] * Fixed that forgery protection can be used without session tracking (Peter Jones) [#139] diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 0147a5c1e8..b37f756c1e 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -76,7 +76,7 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.0.991' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.1.0' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'action_controller' diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 70fc1ced8c..c67654d9a8 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -1,8 +1,8 @@ module ActionPack #:nodoc: module VERSION #:nodoc: MAJOR = 2 - MINOR = 0 - TINY = 991 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end |