AR supporting new intrange data type on PostgreSQL >= 9.2
Restored 'Working with Validation Errors'

Somehow this got lost in my PRs before. I'm going to re-check all the
guides to make sure this didn't happen again elsewhere.
DebugExceptions `File.join` => `File.expand_path`
Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-path

DebugExceptions `File.join` => `File.expand_path`
Add missing requires to core_ext/integer/time
Merge pull request #8532 from ptn/add_missing_require

Add missing requires to core_ext/integer/time
 fix AS::BasicObject :nodoc: [ci skip]
Merge pull request #8539 from frodsan/fix_as_basic_object

Add nodoc to AS::BasicObject [ci skip]
Make conditional_layout? private and update documentation

The conditional_layout? method is not for public use and doesn't
actually do what the documentation suggested it does. It's actually
used to determine whether or not to use the explicit layout definition
defined in a controller or use the implicit layout definition.

Also documentation was added for the action_has_layout? method which
acts as a master switch for disabling the layout for the current
action. This method was added so that action caching didn't depend
on accessing layout internals but is also used by third-parties,
most notably the [Hobo][1] application.

[1]: https://github.com/hobo/hobo
HTML formatting to Rails::InfoController#routes

This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. 

There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR.

![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png)


ATP Railties
Merge pull request #8521 from schneems/schneems/html-routes

HTML formatting to Rails::InfoController#routes
Merge pull request #8528 from le0pard/fixed_ar_intrange

AR supporting new int4range and int8range data type on PostgreSQL >= 9.2
AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix realization
Merge pull request #8542 from le0pard/fixed_ar_intrange

AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request
Format routes as html on debug page

When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. 

In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both.

<hr />

![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
Merge pull request #8543 from schneems/schneems/html-route-error

Format routes as html on debug page
handle protocol option in stylesheet_link_tag and javascript_include_tag

closes #8388
Merge pull request #8389 from nashby/issue-8388

handle protocol option in stylesheet_link_tag and javascript_include_tag
Minor js review [ci skip]

Remove/add ; where necessary, fix indentation.
Added support for validates_uniqueness_of in PostgreSQL array columns. Fixes: #8075.