aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG3
-rw-r--r--actionpack/Rakefile2
-rw-r--r--actionpack/lib/action_pack/version.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 141dcca5e6..7f8affe34c 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*2.0.0 [RC2]* (November 28th, 2007)
* Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Koz] #10292
@@ -124,6 +124,7 @@
* Only accept session ids from cookies, prevents session fixation attacks. [bradediger]
+
*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.12.2 - 1.13.3]
* Fixed that render template did not honor exempt_from_layout #9698 [pezra]
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index f6d2587427..9bd8fbe314 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', '= 1.99.0' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 1.99.1' + 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 a58f8aad7b..9e62961a80 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 99
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end