Fix loading of string arrays in postgres
Avoid leak into controller's action_methods
Merge pull request #10262 from printercu/patch-3

Avoid leak into controller's action_methods
Passing subdomain: '' to url_for removes the subdomain (instead of adding a leading .)
Adding a boolean route constraint checks for presence/absence of request property
Duplicate options before mutating them
Add url generation tests for #10185
Refactor ActionDispatch::Http::URL.build_host_url

Add support for extracting the port from the :host option and for
removing the subdomain by using nil, false or ''.
Add CHANGELOG entries - closes #10180, #10185
Merge pull request #10043 from cconstantine/master

DB with postgres string array column doesn't load fixtures well
Bump arel to 4.0.0
Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."

This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d.

Conflicts:
	railties/lib/rails/generators/app_base.rb

Reason: sprockets 2.9.1 fixes this issue
Use latest coffee-rails release
Use the same uglifier version that the generated applications
Use sass-rails 4.0.0.rc1
Use sprockets-rails 2.0.0.rc4
Revert "Merge pull request #10043 from cconstantine/master"

This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing
changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1.

Reason: This broke the tests
Better ordering
HTML5 breaks
Indent around the scaffold loop
Unindent attributes iteration in scaffold index template

Otherwise we get extra indent for the <td> elements due to the extra
spaces at the beginning of the lines, like this:

      <tr>
          <td><%= author.name %></td>
          <td><%= link_to 'Show', author %></td>
        <td><%= link_to 'Edit', edit_author_path(author) %></td>