diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-03 17:31:35 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-03 17:31:35 -0800 |
| commit | dd13874ff60371b51bd436e70943db932b180b45 (patch) | |
| tree | a0bbbdab818d5b802f86811d50f0461f7b0b5d75 | |
| parent | 79817aa9e7fa7c207868ca56ca8bbd0ee5303d81 (diff) | |
| parent | 9b033d14b240ae1ae8b1486af1d0afa8ae2a1ec6 (diff) | |
| download | rails-dd13874ff60371b51bd436e70943db932b180b45.tar.gz rails-dd13874ff60371b51bd436e70943db932b180b45.tar.bz2 rails-dd13874ff60371b51bd436e70943db932b180b45.zip | |
Merge
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 4 | ||||
| -rw-r--r-- | rails.gemspec | 2 | ||||
| -rw-r--r-- | railties/lib/generators/rails/app/templates/config/boot.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/commands.rb | 3 |
6 files changed, 8 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fd4fd34d3e..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "arel"] - path = arel - url = git://github.com/rails/arel.git diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 12feef4849..c4e07e8786 100755 --- a/activerecord/lib/active_record/base.rb +++ b/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 diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 4343bef3d4..ed7d2a045e 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/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]) diff --git a/rails.gemspec b/rails.gemspec index 89681cb0aa..80443c6f6f 100644 --- a/rails.gemspec +++ b/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 diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb index 70bd40bc4c..7407d6143a 100644 --- a/railties/lib/generators/rails/app/templates/config/boot.rb +++ b/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' 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' |