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

4 files changed, 13 insertions, 5 deletions

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 59132efe98..d877915460 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -76,7 +76,7 @@ module Rails
       @paths.config.locales      = "config/locales"
       @paths.config.environments = "config/environments"
 
-      @paths.app.controllers.push *builtin_directories
+      @paths.app.controllers.concat builtin_directories
 
       @paths.app.load_path!
       @paths.app.metals.load_path!
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index aada7d4a56..d2f6d83659 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -80,6 +80,10 @@ module Rails
         @paths.unshift path
       end
 
+      def concat(paths)
+        @paths.concat paths
+      end
+
       def load_once!
         @load_once = true
         @root.load_once.push *self.paths
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 99c7516a65..9a65096061 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index 94e089a624..4318203a42 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -3,6 +3,7 @@
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
+require 'active_support/core_ext/kernel/requires'
 require 'action_controller/testing/test_case'
 require 'action_view/test_case'
 require 'action_controller/testing/integration'
@@ -29,7 +30,10 @@ end
 begin
   require_library_or_gem 'ruby-debug'
   Debugger.start
-  Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
+  if Debugger.respond_to?(:settings)
+    Debugger.settings[:autoeval] = true
+    Debugger.settings[:autolist] = 1
+  end
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
 end