Prepare for 1.2.6

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
aderyabin · Nov 24, 2007 · d421bb9 · d421bb9
1 parent 63e9687
commit d421bb9
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 13 deletions.
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
@@ -1,3 +1,7 @@
+*1.3.6* (October 12th, 2007)
+
+* Depend on Action Pack 1.13.6
+
 *1.3.5* (October 12th, 2007)
 
 * Depend on Action Pack 1.13.5

diff --git 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.5' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.13.6' + 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
@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
@@ -1,3 +1,7 @@
+*1.13.6* (November 24th, 2007)
+
+* Correct Broken Fix for session_fixation attacks
+
 * Ensure that cookies handle array values correctly.  Closes #9937 [queso]
 
 *1.13.5* (October 12th, 2007)

diff --git 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  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
@@ -1,3 +1,10 @@
+*1.2.6* (November 24th, 2007)
+
+* Depend on Action Pack 1.13.6
+
+* Depend on Active Record 1.15.6
+
+
 *1.2.5* (October 12th, 2007)
 
 * Depend on Action Pack 1.13.5

diff --git 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.5' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 1.15.5' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.13.6' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.15.6' + 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
@@ -2,7 +2,7 @@ module ActionWebService
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,4 +1,4 @@
-*SVN*
+*1.15.6* (November 24th, 2007)
 
 * Allow association redefinition in subclasses.  #9346 [wildchild]
 

diff --git 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  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

diff --git a/railties/Rakefile b/railties/Rakefile
@@ -289,10 +289,10 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('rake', '>= 0.7.2')
   s.add_dependency('activesupport',    '= 1.4.4' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.15.5' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.13.5' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.3.5' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 1.2.5' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.15.6' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.13.6' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.3.6' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 1.2.6' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

diff --git 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  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end