Andrew White 622e4ab424 Fix shorthand routes where controller and action are in the scope ...

Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856

Backport of 37b4276

2013-06-25 11:00:19 +01:00

..

abstract_controller

Shush uninitialized @_layout warning

2012-09-28 10:53:17 -07:00

action_controller

Merge pull request #10478 from cainlevy/patch-1

2013-05-06 22:19:46 -03:00

action_dispatch

Fix shorthand routes where controller and action are in the scope

2013-06-25 11:00:19 +01:00

action_pack

bumping to 3.2.13

2013-03-18 09:23:04 -07:00

action_view

Merge pull request #10971 from dtaniwaki/escape_link_to_unless

2013-06-24 16:15:56 -03:00

sprockets

Fixed assets loading performance in 3.2.13

2013-03-20 16:13:30 +11:00

abstract_controller.rb

Refactor ActionMailer to not use hide_actions

2010-09-03 22:59:11 +02:00

action_controller.rb

Revert the serializers API as other alternatives are now also under discussion

2011-11-25 19:29:39 +00:00

action_dispatch.rb

Extract the rendering of public exceptions pages into a Rack app.

2011-12-16 10:45:59 +01:00

action_pack.rb

We're in 2011, let's update our license

2011-02-22 18:24:20 -02:00

action_view.rb

Fixes for using action view template in isolation.

2011-11-30 09:53:09 +01:00