diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-04 13:05:27 +0100 |
| commit | ab14e3f8628da81535c09eab3ba48d06725c6769 (patch) | |
| tree | 1409b4049bbc3075f7618a4759797dc6de2116d9 /railties/lib/rails | |
| parent | 31248fe3698c8d6c54465dfdf463ea49749e1c33 (diff) | |
| parent | c9ec28b2b643de7a315276cc285d7a4506b9d568 (diff) | |
| download | rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.gz rails-ab14e3f8628da81535c09eab3ba48d06725c6769.tar.bz2 rails-ab14e3f8628da81535c09eab3ba48d06725c6769.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/commands.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/documentation.rake | 2 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index f0dcf61d98..4240038673 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -59,6 +59,9 @@ when 'runner' require 'rails/commands/runner' require ENV_PATH + +when '--version', '-v' + puts "Rails #{Rails::VERSION::STRING}" when '--help', '-h' puts HELP_TEXT when '--version', '-v' diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 3f49a9a720..7095046f21 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -14,7 +14,7 @@ namespace :doc do desc 'Generate documentation for the Rails framework. Specify path with PATH="/path/to/rails"' Rake::RDocTask.new("rails") { |rdoc| path = ENV['RAILS_PATH'] || 'vendor/gems/gems' - version = '-3.0.pre' unless ENV['RAILS_PATH'] + version = '-3.0.0.beta' unless ENV['RAILS_PATH'] rdoc.rdoc_dir = 'doc/api' rdoc.template = "#{ENV['template']}.rb" if ENV['template'] rdoc.title = "Rails Framework Documentation" diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 9a65096061..c327d4545a 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 3 MINOR = 0 - TINY = "pre" + TINY = "0.beta" STRING = [MAJOR, MINOR, TINY].join('.') end |