This reverts commit 36c6aa01.

This reverts commit e9a8e005.

[#1002 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

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

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it.

[#958 state:resolved]
Signed-off-by: NJonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9.
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	actionpack/test/controller/layout_test.rb

Mailer layouts behaves just like controller layouts, except layout names need to
have '_mailer' postfix for them to be automatically picked up.

Fixes optimised named routes generating question mark followed by nothing when provided an empty hash as the last argument.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#481 state:committed]

[#887 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Adds :shallow option to resource route definition. If true, paths for nested
resources which reference a specific member (ie. those with an :id parameter)
will not use the parent path prefix or name prefix.

Example :

map.resources :users, :shallow => true do |user|
  user.resources :posts
end

* GET /users/1/posts (maps to PostsController#index action as usual)
  named route "user_posts" is added as usual.

* GET /posts/2 (maps to PostsController#show action as if it were not nested)
  Additionally, named route "post" is added too.

Make assert_select_rjs code more readable, make use of unused constants and use more simple Regexps.

[#540 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Ticket originally from http://dev.rubyonrails.org/ticket/3641Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#871 state:committed]

Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#931 state:committed]

Please install render_component plugin from http://github.com/rails/render_component/tree/master
if your application uses this functionality.

[#407 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>