aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-25 22:11:48 +0000
commitc7a6b9862dca37fd393a7585f850dfb46725ad40 (patch)
treea135a8b2e00f10d9b71e669b9d46fbc710d86e41 /actionpack
parent06303ed34eea1f9c3dfa8c7d0ada186b0faf648f (diff)
downloadrails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.gz
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.tar.bz2
rails-c7a6b9862dca37fd393a7585f850dfb46725ad40.zip
Prepared for release of 0.14.2 (RC3)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG3
-rwxr-xr-xactionpack/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 028e7e7866..721ac3ac96 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*1.10.2* (October 26th, 2005)
* Reset template variables after using render_to_string [skaes@web.de]
@@ -6,6 +6,7 @@
* Abbreviate RAILS_ROOT in traces
+
*1.10.1* (October 19th, 2005)
* Update error trace templates [Nicholas Seckar]
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index e8a3d22873..a90b2f2db2 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -62,7 +62,7 @@ spec = Gem::Specification.new do |s|
s.has_rdoc = true
s.requirements << 'none'
- s.add_dependency('activesupport', '= 1.2.1' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 1.2.2' + 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 3bc83cd75a..ca4b31c827 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -2,7 +2,7 @@ module ActionPack
module Version #:nodoc:
MAJOR = 1
MINOR = 10
- TINY = 1
+ TINY = 2
STRING = [MAJOR, MINOR, TINY].join('.')
end