From 478cd8223c5ef43abbbb347c5517910a5ab91b67 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 5 Oct 2007 04:11:29 +0000 Subject: [PATCH] Tagged 1.2.4 for release git-svn-id: http://svn-commit.rubyonrails.org/rails/tags/rel_1-2-4@7741 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/CHANGELOG | 5 +++++ actionmailer/Rakefile | 2 +- actionmailer/lib/action_mailer/version.rb | 2 +- actionpack/CHANGELOG | 2 +- actionpack/Rakefile | 2 +- actionpack/lib/action_pack/version.rb | 2 +- actionwebservice/CHANGELOG | 7 +++++++ actionwebservice/Rakefile | 4 ++-- actionwebservice/lib/action_web_service/version.rb | 2 +- activerecord/CHANGELOG | 2 +- activerecord/Rakefile | 2 +- activerecord/lib/active_record/version.rb | 2 +- activesupport/CHANGELOG | 2 +- activesupport/lib/active_support/version.rb | 2 +- railties/CHANGELOG | 3 ++- railties/Rakefile | 10 +++++----- railties/lib/rails/version.rb | 2 +- 17 files changed, 33 insertions(+), 20 deletions(-) diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 968f621a66521..58afd80699c3d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*1.3.4* (October 4th, 2007) + +* Depend on Action Pack 1.13.4 + + *1.3.3* (March 12th, 2007) * Depend on Action Pack 1.13.3 diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index aac65b21c3ce9..aa1e2d042763f 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.13.3' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.13.4' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 03f075fbced54..5a76abc697f32 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 1 MINOR = 3 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d858097f2530d..bd0d7b4d38bd1 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*1.13.4* (October 4th, 2007) * Only accept session ids from cookies, prevents session fixation attacks. [bradediger] diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 4bca6b6dfd58b..7856936e08ef5 100755 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -75,7 +75,7 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 1.4.2' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.4.3' + 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 09eaef6edaa7a..9eb61f9289303 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 = 13 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG index 2c3463e6502fe..c86777329ea91 100644 --- a/actionwebservice/CHANGELOG +++ b/actionwebservice/CHANGELOG @@ -1,3 +1,10 @@ +*1.2.4* (October 4th, 2007) + +* Depend on Action Pack 1.13.4 + +* Depend on Active Record 1.15.4 + + *1.2.3* (March 12th, 2007) * Depend on Action Pack 1.13.3 diff --git a/actionwebservice/Rakefile b/actionwebservice/Rakefile index fec9aae903015..80ecf38976837 100644 --- a/actionwebservice/Rakefile +++ b/actionwebservice/Rakefile @@ -71,8 +71,8 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "aws" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 1.13.3' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.15.3' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.13.4' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.15.4' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionwebservice/lib/action_web_service/version.rb b/actionwebservice/lib/action_web_service/version.rb index ebcb7eaac454f..61dce62aa3cfb 100644 --- a/actionwebservice/lib/action_web_service/version.rb +++ b/actionwebservice/lib/action_web_service/version.rb @@ -2,7 +2,7 @@ module ActionWebService module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index d1bc5ec050c71..87fe48b6071d3 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*1.15.4* (October 4th, 2007) * Fix #count on a has_many :through association so that it recognizes the :uniq option. Closes #8801 [lifofifo] diff --git a/activerecord/Rakefile b/activerecord/Rakefile index fb3c2c74cc3ab..8b1c5c656584a 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -151,7 +151,7 @@ spec = Gem::Specification.new do |s| s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) } end - s.add_dependency('activesupport', '= 1.4.2' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.4.3' + PKG_BUILD) s.files.delete "test/fixtures/fixture_database.sqlite" s.files.delete "test/fixtures/fixture_database_2.sqlite" diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 4027561d84bdc..0df2df797673a 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 1 MINOR = 15 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 0f5bf245a4bb5..3a94943f3ff3f 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*1.4.3* (October 4th, 2007) * Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin. #8453 [candlerb, Jeremy Kemper] diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb index d254873f713fb..82c53090b5288 100644 --- a/activesupport/lib/active_support/version.rb +++ b/activesupport/lib/active_support/version.rb @@ -2,7 +2,7 @@ module ActiveSupport module VERSION #:nodoc: MAJOR = 1 MINOR = 4 - TINY = 2 + TINY = 3 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9c6b174340160..a81ae7fcbd21e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*1.2.4* (October 4th, 2007) * Add a new rake task to aid debugging of named routes. @@ -14,6 +14,7 @@ * Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows. #6755 [Jeremy Kemper, trevor] + *1.2.3* (March 12th, 2007) * Ruby 1.8.6 compatibility fixes. Upgrade rake dependency to 0.7.2. diff --git a/railties/Rakefile b/railties/Rakefile index e2a9c90c9079f..549b1ba0d3e75 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -288,11 +288,11 @@ spec = Gem::Specification.new do |s| EOF s.add_dependency('rake', '>= 0.7.2') - s.add_dependency('activesupport', '= 1.4.2' + PKG_BUILD) - s.add_dependency('activerecord', '= 1.15.3' + PKG_BUILD) - s.add_dependency('actionpack', '= 1.13.3' + PKG_BUILD) - s.add_dependency('actionmailer', '= 1.3.3' + PKG_BUILD) - s.add_dependency('actionwebservice', '= 1.2.3' + PKG_BUILD) + s.add_dependency('activesupport', '= 1.4.3' + PKG_BUILD) + s.add_dependency('activerecord', '= 1.15.4' + PKG_BUILD) + s.add_dependency('actionpack', '= 1.13.4' + PKG_BUILD) + s.add_dependency('actionmailer', '= 1.3.4' + PKG_BUILD) + s.add_dependency('actionwebservice', '= 1.2.4' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index b6bd42054aa99..03ee0154d823d 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 1 MINOR = 2 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end