rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Removing to_shorthand from default_controller_and_action. Fixes #6497	Luiz Felipe	2012-09-19	1	-1/+1
*	Use internal instance variable naming scheme for mounted URL helper proxies	Sam Pohlenz	2012-09-09	1	-1/+1
*	Make enhanced routing Concerns more tell-don't-ask	Ernie Miller	2012-09-03	1	-25/+55
*	Fix concerns not executing block in mapper	Ernie Miller	2012-09-03	1	-2/+19
*	Allow routing concerns to accept a callable	Ernie Miller	2012-09-03	1	-3/+7
*	Update actionpack/lib/action_dispatch/routing/mapper.rb	Erik Ordway	2012-08-29	1	-1/+1
*	refactor route_set `generate_extras` functionality	schneems	2012-08-28	1	-17/+9
*	Add Missing Keys from Journey on failed URL format	schneems	2012-08-28	1	-4/+4
*	removed : warning: `*' interpreted as argument prefix	Arun Agrawal	2012-08-28	1	-1/+1
*	Don't require action_dispatch in ActionView::UrlHelpers	Piotr Sarnacki	2012-08-28	1	-0/+2
*	Make sure :via works with mount	Pratik Naik	2012-08-20	1	-2/+3
*	Add CHANGELOG entry and documentation for Routing Concerns	Rafael Mendonça França	2012-08-13	1	-0/+38
*	Implementing Routing Concerns	Rafael Mendonça França	2012-08-13	1	-1/+23
*	Further refactor build_conditions in route set	Carlos Antonio da Silva	2012-08-10	1	-5/+3
*	Fix handling SCRIPT_NAME from within mounted engine's	Piotr Sarnacki	2012-08-11	1	-5/+12
*	RouteSet: refactor internals	Bogdan Gusiev	2012-08-10	1	-10/+7
*	Revert "polymorphic_url with an array generates a query string"	Andrew White	2012-08-04	1	-4/+1
*	Revert "Refactor passing url options via array for polymorphic_url"	Andrew White	2012-08-04	1	-2/+2
*	RouteSet: cleanup some unneeded compexity	Bogdan Gusiev	2012-08-04	1	-16/+7
*	Renamed _path_segments to _recall	Bogdan Gusiev	2012-08-04	1	-2/+2
*	Simplify logical statement	Bogdan Gusiev	2012-08-04	1	-4/+2
*	Merge branch 'polymorphic_url_builds_query_string_with_array'	Andrew White	2012-08-04	1	-1/+4
\|\
\| *	Refactor passing url options via array for polymorphic_url	Andrew White	2012-08-04	1	-2/+2
\| *	polymorphic_url with an array generates a query string	Romain Tribes	2012-08-04	1	-1/+4
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-08-04	1	-0/+8
\|\ \ \| \|/ \|/\|
\| *	copy edits [ci skip]	Vijay Dev	2012-08-04	1	-2/+2
\| *	fix punctuation in #resources and #match documentation [ci skip]	Francesco Rodriguez	2012-07-31	1	-4/+4
\| *	Update #match documentation [ci skip]	Robert Pankowecki	2012-07-31	1	-0/+4
\| *	Update #resources documentation [ci skip]	Robert Pankowecki	2012-07-31	1	-0/+4
* \|	load active_support/core_ext/object/blank in active_support/rails	Xavier Noria	2012-08-02	2	-2/+0
* \|	fix typo in documentation	Anatoly Makarevich	2012-07-26	1	-1/+1
\|/
*	Don't assume resource param is :id when using shallow routes	Andrew White	2012-07-20	1	-1/+3
*	Support constraints on resource custom params when nesting	Andrew White	2012-07-20	1	-8/+12
*	Add support for optional root segments containing slashes	Andrew White	2012-07-17	1	-1/+1
*	Fix class_eval without __FILE__ and __LINE__.	kennyj	2012-07-18	1	-1/+1
*	Raise a helpful error message on #mount misuse	Carl Lerche	2012-07-10	1	-0/+4
*	Rename RouteInspector to RoutesInspector	Carlos Antonio da Silva	2012-07-08	1	-1/+1
*	move route_inspector to actionpack	@schneems and @mattt	2012-07-07	1	-0/+121
*	Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-ap	Carlos Antonio da Silva	2012-06-30	1	-7/+7
\|\
\| *	Remove ActiveModel dependency from ActionPack	Guillermo Iguaran	2012-06-30	1	-7/+7
* \|	Revert "Allow loading external route files from the router"	José Valim	2012-06-29	2	-19/+0
\|/
*	Support unicode character route in config/routes.rb.	kennyj	2012-06-16	1	-1/+1
*	Merge pull request #6588 from nbibler/polymorphic_to_model	José Valim	2012-06-01	1	-1/+7
*	Include routes.mounted_helpers into integration tests	Piotr Sarnacki	2012-06-01	1	-1/+1
*	Simplify logic to initialize valid conditions in RouteSet	Carlos Antonio da Silva	2012-05-31	1	-7/+3
*	Remove implicit dependency on pathname	José Valim	2012-05-25	1	-3/+3
*	Merge pull request #2549 from trek/RoutingErrorForMissingControllers	Aaron Patterson	2012-05-21	1	-3/+7
\|\
\| *	When a route references a missing controller, raise ActionController::Routing...	Trek Glowacki	2011-08-16	1	-3/+7
* \|	Return 400 Bad Request for URL paths with invalid encoding.	Andrew White	2012-05-20	2	-0/+18
* \|	Improve `rake routes` output for redirects - closes #6369.	Andrew White	2012-05-19	1	-12/+22