Merge branch 'master' into cherry

Conflicts:
	activesupport/CHANGELOG
	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
	activesupport/lib/active_support/core_ext/hash/conversions.rb
	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
	activesupport/lib/active_support/core_ext/string/multibyte.rb
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/lib/active_support/deprecation.rb

3 files changed, 9 insertions, 6 deletions

diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index 9f8b59aa3d..7f9a6221d9 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -20,5 +20,5 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
-require 'action_controller/dispatcher'
+require 'action_controller/dispatch/dispatcher'
 Dispatcher = ActionController::Dispatcher
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index a04405a7c2..a03be59a2b 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -378,8 +378,11 @@ Run `rake gems:install` to install the missing gems.
 
     def load_view_paths
       if configuration.frameworks.include?(:action_view)
-        ActionController::Base.view_paths.load! if configuration.frameworks.include?(:action_controller)
-        ActionMailer::Base.view_paths.load! if configuration.frameworks.include?(:action_mailer)
+        if configuration.cache_classes
+          view_path = ActionView::Template::FileSystemPath.new(configuration.view_path)
+          ActionController::Base.view_paths = view_path if configuration.frameworks.include?(:action_controller)
+          ActionMailer::Base.template_root = view_path if configuration.frameworks.include?(:action_mailer)
+        end
       end
     end
 
@@ -565,7 +568,7 @@ Run `rake gems:install` to install the missing gems.
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
 
       configuration.middleware.insert_before(
-        :"ActionController::RewindableInput",
+        :"ActionDispatch::RewindableInput",
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
     end
 
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb
index ee24ea3a45..94e089a624 100644
--- a/railties/lib/test_help.rb
+++ b/railties/lib/test_help.rb
@@ -3,9 +3,9 @@
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
-require 'action_controller/test_case'
+require 'action_controller/testing/test_case'
 require 'action_view/test_case'
-require 'action_controller/integration'
+require 'action_controller/testing/integration'
 require 'action_mailer/test_case' if defined?(ActionMailer)
 
 if defined?(ActiveRecord)