Conflicts:

	actionpack/lib/action_controller/base.rb
	railties/lib/rails_generator/commands.rb

Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached

Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class.

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

ActiveSupport::CoreExtensions::Hash: Slightly modified wording, plus example with reverse_merge vs. merge

ActionController::Streaming: Added missing documentation for :x_sendfile and :length options to send_file method. Added information that streaming can be turned off in a more prominent spot. Fixed a few typos. Consolidated wording in options descriptions of send_file/send_data.

If both the actual redirection and the asserted redirection are hashes, succeed if the asserted redirection is a strict subset of the actual redirection.

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Changed ActionView::TemplateHandler#render API method signature to render(template, local_assigns = {})

Use require_dependency 'application' not require in the console bootstraps to avoid requiring application.rb twice

This reverts commit 2d372d70.

Added notes to Routing documentation and routes.rb regarding defaults routes opening the whole application for GET requests
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Put a newline rather than a semicolon at the end of RJS source to avoid parse errors with embedded heredocs

Use ActionController::Base.logger to report template compilation errors since there is no AV::Base.logger