aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-05 00:59:57 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-05 00:59:57 +0000
commit0633bb865bc755d4a67d6ade8ca588d2f3107b0f (patch)
tree06a21a73a82e5f9cbe6b68c2cf528ec15d95a9c6 /railties
parent545053856367b7ac42f556c113a23252d3e55c5a (diff)
downloadrails-0633bb865bc755d4a67d6ade8ca588d2f3107b0f.tar.gz
rails-0633bb865bc755d4a67d6ade8ca588d2f3107b0f.tar.bz2
rails-0633bb865bc755d4a67d6ade8ca588d2f3107b0f.zip
Update versions to match latest from stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rw-r--r--railties/Rakefile10
-rw-r--r--railties/lib/rails_version.rb6
2 files changed, 8 insertions, 8 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index 9a390696fb..446a4456f8 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -273,11 +273,11 @@ spec = Gem::Specification.new do |s|
EOF
s.add_dependency('rake', '>= 0.6.2')
- s.add_dependency('activesupport', '= 1.2.3' + PKG_BUILD)
- s.add_dependency('activerecord', '= 1.13.0' + PKG_BUILD)
- s.add_dependency('actionpack', '= 1.11.0' + PKG_BUILD)
- s.add_dependency('actionmailer', '= 1.1.3' + PKG_BUILD)
- s.add_dependency('actionwebservice', '= 0.9.3' + PKG_BUILD)
+ s.add_dependency('activesupport', '= 1.2.5' + PKG_BUILD)
+ s.add_dependency('activerecord', '= 1.13.2' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 1.11.2' + PKG_BUILD)
+ s.add_dependency('actionmailer', '= 1.1.5' + PKG_BUILD)
+ s.add_dependency('actionwebservice', '= 1.0.0' + 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 a36f45bd6f..5a68bf8d3e 100644
--- a/railties/lib/rails_version.rb
+++ b/railties/lib/rails_version.rb
@@ -1,8 +1,8 @@
module Rails
module VERSION #:nodoc:
- MAJOR = 0
- MINOR = 14
- TINY = 3
+ MAJOR = 1
+ MINOR = 0
+ TINY = 0
STRING = [MAJOR, MINOR, TINY].join('.')
end