Merge pull request #11411 from dscataglini/master

Active support callback's before/after/around filters are not correctly making their singleton methods private
+EOL
Correct factual error for page not found
Merge pull request #14679 from pbharadiya/master

Correct factual error for page not found [ci skip]
Add a failing test for a URL helper that was broken by a6b9ea2.
Isolate debugger related code
Prevent generation of extra whitespace in templates
[ci skip] Update code snippets to latest master (initialization.md).
Also update the `server.run` example (Replace Mongrel with Puma).
Fix error for aggregate methods with select, see issue #13648
Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippets

[ci skip] Update code snippets to latest master (initialization.md).
Merge pull request #11656 from emre-basala/xml_mini_test

Add tests to ActiveSupport:XmlMini to_tag method
Require action_controller before any other action_controller file

This will load properly the loading hooks.

Closes rails/sass-rails#205
Merge branch 'master' into rm-uuid-fixtures

Conflicts:
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
No need to call send
Merge branch 'rm-uuid-fixtures'
Remove warning of unused variable
Add after_commit/after_rollback to callback list

Adding after_commit/after_rollback to list of callbacks in order helps
explain the callback order as well as making it consistent with the API
docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
[ci skip] Remove false documentation
Merge pull request #14695 from akshay-vishnoi/doc_changes

[ci skip] Remove false documentation
Merge pull request #14694 from heironimus/callback_guide

Add after_commit/after_rollback to callback list