9 files changed, 64 insertions, 7 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 58dc6b8ab4..4fd8190ee5 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,7 +1,13 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   No changes.
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   Upgrade mail version to 2.4.3 *ML*
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 6f737001de..5571513186 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Rails 3.2.6 (unreleased) ##
+
+*   Include mounted_helpers (helpers for accessing mounted engines) in ActionDispatch::IntegrationTest by default. *Piotr Sarnacki*
+
+
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   Deprecate old APIs for highlight, excerpt and word_wrap *Jeremy Walker*
@@ -24,6 +34,7 @@
 *   Strip [nil] from parameters hash. Thanks to Ben Murphy for
     reporting this! CVE-2012-2660
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index ad78854471..ac784b3b60 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -177,8 +177,11 @@ module ActionDispatch
 
         # If the app is a Rails app, make url_helpers available on the session
         # This makes app.url_for and app.foo_path available in the console
-        if app.respond_to?(:routes) && app.routes.respond_to?(:url_helpers)
-          singleton_class.class_eval { include app.routes.url_helpers }
+        if app.respond_to?(:routes)
+          singleton_class.class_eval do
+            include app.routes.url_helpers if app.routes.respond_to?(:url_helpers)
+            include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
+          end
         end
 
         reset!
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index fda263310b..a9e59e2dbb 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -495,11 +495,26 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     @routes ||= ActionDispatch::Routing::RouteSet.new
   end
 
+  class MountedApp
+    def self.routes
+      @routes ||= ActionDispatch::Routing::RouteSet.new
+    end
+
+    routes.draw do
+      match 'baz', :to => 'application_integration_test/test#index', :as => :baz
+    end
+
+    def self.call(*)
+    end
+  end
+
   routes.draw do
     match '',    :to => 'application_integration_test/test#index', :as => :empty_string
 
     match 'foo', :to => 'application_integration_test/test#index', :as => :foo
     match 'bar', :to => 'application_integration_test/test#index', :as => :bar
+
+    mount MountedApp => '/mounted', :as => "mounted"
   end
 
   def app
@@ -512,6 +527,10 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     assert_equal '/bar', bar_path
   end
 
+  test "includes mounted helpers" do
+    assert_equal '/mounted/baz', mounted.baz_path
+  end
+
   test "route helpers after controller access" do
     get '/'
     assert_equal '/', empty_string_path
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6767fb74f5..0bd7685f9b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   Restore behavior of Active Record 3.2.3 scopes.
+    A series of commits relating to preloading and scopes caused a regression.
+
+    *Andrew White*
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   Perf fix: Don't load the records when doing assoc.delete_all.
@@ -16,6 +24,7 @@
 *   Predicate builder should not recurse for determining where columns.
     Thanks to Ben Murphy for reporting this! CVE-2012-2661
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   Added find_or_create_by_{attribute}! dynamic method. *Andrew White*
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 5a626a262c..bf2a284284 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,7 +1,13 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   No changes.
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   No changes.
 
+
 ## Rails 3.2.3 (March 30, 2012) ##
 
 *   No changes.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index b231bdd1ac..e1ed948ede 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,11 +1,14 @@
+## Rails 3.2.5 (Jun 1, 2012) ##
+
+*   ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
+    for custom JSON string literals. *Erich Menge*
+
+
 ## Rails 3.2.4 (May 31, 2012) ##
 
 *   Added #beginning_of_hour and #end_of_hour to Time and DateTime core
     extensions. *Mark J. Titorenko*
 
-*   ActiveSupport::JSON::Variable is deprecated. Define your own #as_json and #encode_json methods
-    for custom JSON string literals. *Erich Menge*
-
 
 ## Rails 3.2.3 (March 30, 2012) ##
 
diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb
index ece6bbba3b..4053113b4b 100644
--- a/railties/lib/rails/generators/rails/controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb
@@ -1,7 +1,7 @@
 <% if namespaced? -%>
 require_dependency "<%= namespaced_file_path %>/application_controller"
-<% end -%>
 
+<% end -%>
 <% module_namespacing do -%>
 class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 593c8d85e6..6e4ad38c16 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -1,7 +1,7 @@
 <% if namespaced? -%>
 require_dependency "<%= namespaced_file_path %>/application_controller"
-<% end -%>
 
+<% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
   # GET <%= route_url %>