Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]

define surface area of the class.

Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf3
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea0
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb9
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d
      3942cb40
      f8ea9f85
      e3b166aa
      ae9f258e
      44423126

0cb020b4
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b162
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.

Signed-off-by: NDavid Heinemeier Hansson <david@loudthinking.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

- Refactor Rails::InfoController tests.
- Return forbidden status from the InfoController for remote requests instead of a 500.
- Add tests for displaying middleware in Rails::Info.
Signed-off-by: NJoshua Peek <josh@joshpeek.com>