Skip to content

Commit

Permalink
Preparing for Rails 1.1.5
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/stable@4738 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Aug 9, 2006
1 parent 4874df1 commit 0d21068
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion actionmailer/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*SVN*
*1.2.4* (August 8th, 2006)

* Backport of documentation enhancements. [Kevin Clark, Marcel Molina Jr]

Expand Down
2 changes: 1 addition & 1 deletion actionmailer/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.3' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)

s.has_rdoc = true
s.requirements << 'none'
Expand Down
2 changes: 1 addition & 1 deletion actionmailer/lib/action_mailer/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 1
MINOR = 2
TINY = 3
TINY = 4

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down
2 changes: 1 addition & 1 deletion actionpack/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*SVN*
*1.12.4* (August 8th, 2006)

* Documentation fix: integration test scripts don't require integration_test. #4914 [Frederick Ros <sl33p3r@free.fr>]

Expand Down
2 changes: 1 addition & 1 deletion actionpack/lib/action_pack/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module ActionPack #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 12
TINY = 3
TINY = 4

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down
5 changes: 5 additions & 0 deletions actionwebservice/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
*1.1.5* (August 8th, 2006)

* Rely on Action Pack 1.12.4 and Active Record 1.14.4


*1.1.4* (June 29th, 2006)

* Rely on Action Pack 1.12.3
Expand Down
4 changes: 2 additions & 2 deletions actionwebservice/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.3' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.3' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD)

s.has_rdoc = true
s.requirements << 'none'
Expand Down
2 changes: 1 addition & 1 deletion actionwebservice/lib/action_web_service/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module ActionWebService
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
TINY = 4
TINY = 5

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down
2 changes: 1 addition & 1 deletion activerecord/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*SVN*
*1.14.4* (August 8th, 2006)

* Add warning about the proper way to validate the presence of a foreign key. #4147 [Francois Beausoleil <francois.beausoleil@gmail.com>]

Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module ActiveRecord
module VERSION #:nodoc:
MAJOR = 1
MINOR = 14
TINY = 3
TINY = 4

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down
4 changes: 3 additions & 1 deletion railties/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
*SVN*
*1.1.5* (August 8th, 2006)

* Mention in docs that config.frameworks doesn't work when getting Rails via Gems. #4857 [Alisdair McDiarmid]

* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.]

* Includes critical security patch


*1.1.4* (June 29th, 2006)

Expand Down
8 changes: 4 additions & 4 deletions railties/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ spec = Gem::Specification.new do |s|

s.add_dependency('rake', '>= 0.7.1')
s.add_dependency('activesupport', '= 1.3.1' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.3' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.3' + PKG_BUILD)
s.add_dependency('actionmailer', '= 1.2.3' + PKG_BUILD)
s.add_dependency('actionwebservice', '= 1.1.4' + PKG_BUILD)
s.add_dependency('activerecord', '= 1.14.4' + PKG_BUILD)
s.add_dependency('actionpack', '= 1.12.4' + PKG_BUILD)
s.add_dependency('actionmailer', '= 1.2.4' + PKG_BUILD)
s.add_dependency('actionwebservice', '= 1.1.5' + PKG_BUILD)

s.rdoc_options << '--exclude' << '.'
s.has_rdoc = false
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 1
MINOR = 1
TINY = 4
TINY = 5

STRING = [MAJOR, MINOR, TINY].join('.')
end
Expand Down

0 comments on commit 0d21068

Please sign in to comment.