Merge

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "arel"]
-	path = arel
-	url = git://github.com/rails/arel.git

activerecord/lib/active_record/base.rb

@@ -79,7 +79,7 @@ module ActiveRecord #:nodoc:
 
     def initialize(message, original_exception)
       super(message)
-      @original_exception, = original_exception
+      @original_exception = original_exception
     end
   end
 

activerecord/lib/active_record/railties/databases.rake

@@ -28,8 +28,8 @@ namespace :db do
 
   desc 'Create the database defined in config/database.yml for the current Rails.env - also makes test database if in development mode'
   task :create => :load_config do
-    # Make the test database at the same time as the development one
-    if Rails.env == 'development'
+    # Make the test database at the same time as the development one, if it exists
+    if Rails.env.development? && ActiveRecord::Base.configurations['test']
       create_database(ActiveRecord::Base.configurations['test'])
     end
     create_database(ActiveRecord::Base.configurations[Rails.env])

rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activeresource',   '= 3.0.0.beta')
   s.add_dependency('actionmailer',     '= 3.0.0.beta')
   s.add_dependency('railties',         '= 3.0.0.beta')
-  s.add_dependency('bundler',          '>= 0.9.0.pre')
+  s.add_dependency('bundler',          '>= 0.9.0.pre5')
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

railties/lib/generators/rails/app/templates/config/boot.rb

@@ -1,6 +1,6 @@
 # Use Bundler (preferred)
 begin
-  require File.expand_path('../../vendor/environment', __FILE__)
+  require File.expand_path('../../.bundle/environment', __FILE__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'

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'