Merge branch 'master' of git://github.com/rails/rails

5 files changed, 32 insertions, 8 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 0b67479742..24ba378efe 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,4 +1,18 @@
-*Edge*
+*Rails 3.0.0 [beta 2] (April 1st, 2010)*
+
+* Session store configuration has changed [YK & CL]
+
+    config.session_store :cookie_store, {:key => "..."}
+    config.cookie_secret = "fdsfhisdghfidugnfdlg"
+
+* railtie_name and engine_name are deprecated. You can now add any object to
+  the configuration object: config.your_plugin = {} [JK]
+
+* Added config.generators.templates to provide alternative paths for the generators
+  to look for templates [JV]
+
+
+*Rails 3.0.0 [beta 1] (February 4, 2010)*
 
 * Added "rake about" as a replacement for script/about [DHH]
 
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index fccae9190a..fbad3c9ef1 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -31,6 +31,9 @@ module Rails::Generators
     class_option :edge, :type => :boolean, :default => false,
                         :desc => "Setup the application with Gemfile pointing to Rails repository"
 
+    class_option :skip_gemfile, :type => :boolean, :default => false,
+                                     :desc => "Don't create a Gemfile"
+
     class_option :skip_activerecord, :type => :boolean, :aliases => "-O", :default => false,
                                      :desc => "Skip ActiveRecord files"
 
@@ -71,7 +74,7 @@ module Rails::Generators
       copy_file "gitignore", ".gitignore" unless options[:skip_git]
       template "Rakefile"
       template "config.ru"
-      template "Gemfile"
+      template "Gemfile" unless options[:skip_gemfile]
     end
 
     def create_app_files
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index dc20ffb2fa..bd4fedcdec 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -11,8 +11,9 @@ require "active_resource/railtie"
 require "rails/test_unit/railtie"
 <% end -%>
 
-# Auto-require default libraries and those for the current Rails environment.
-Bundler.require :default, Rails.env
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
 
 module <%= app_const_base %>
   class Application < Rails::Application
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
index 3cb561d41f..3971a07012 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb
@@ -1,8 +1,14 @@
-# Use Bundler (preferred)
+# Use locked gems if present.
 begin
   require File.expand_path('../../.bundle/environment', __FILE__)
+
 rescue LoadError
+  # Otherwise, use RubyGems.
   require 'rubygems'
-  require 'bundler'
-  Bundler.setup
+
+  # And set up the gems listed in the Gemfile.
+  if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+    require 'bundler'
+    Bundler.setup
+  end
 end
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 1dd8fa0ec7..7c47cbeabd 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta1"
+    BUILD = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end