Andrew White 37b4276dbf 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		2013-06-25 06:04:26 +01:00
..
abstract_controller	deprecating string based terminators	2013-05-14 16:03:09 -07:00
action_controller	Remove duplicate letter 'a'. [ci skip]	2013-06-19 12:19:06 +03:00
action_dispatch	Fix shorthand routes where controller and action are in the scope	2013-06-25 06:04:26 +01:00
action_pack	rails/master is now 4.1.0.beta	2013-04-29 13:15:24 -03:00
abstract_controller.rb	load active_support/core_ext/module/delegation in active_support/rails	2012-08-02 21:59:23 +02:00
action_controller.rb	Remove ActionController::RecordIdentifier was deprecated.	2013-06-01 23:22:12 +09:00
action_dispatch.rb	Remove extra whitespace	2013-04-06 00:54:44 +03:00
action_pack.rb	Updated copyright notices for 2013	2012-12-31 20:35:29 +00:00