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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7495 from steveklabnik/issue_7478	Aaron Patterson	2012-09-01	3	-4/+18
\|\
\| *	Force reloading of the session after destroy	Andreas Loupasakis	2012-09-01	1	-0/+3
\| *	Override rack's destroy_session in cookie store	Andreas Loupasakis	2012-09-01	1	-0/+8
\| *	Assign a new session_id to session options hash	Andreas Loupasakis	2012-09-01	1	-2/+2
\| *	Properly reset the session on reset_session	Steve Klabnik	2012-08-31	1	-2/+5
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-01	1	-1/+1
\|\ \
\| * \|	Fix comment about Session.	Steve Klabnik	2012-08-31	1	-1/+1
* \| \|	Revert "Merge pull request #7452 from arunagw/memcached_dalli"	Jon Leighton	2012-08-31	1	-3/+3
* \| \|	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
* \|	Merge pull request #7452 from arunagw/memcached_dalli	Rafael Mendonça França	2012-08-28	1	-3/+3
\|\ \
\| * \|	More fixes for action pack tests with Dalli.	Arun Agrawal	2012-08-27	1	-3/+3
\| \|/
* \|	Don't require action_dispatch in ActionView::UrlHelpers	Piotr Sarnacki	2012-08-28	1	-0/+2
* \|	Move action_controller/vendor/html-scanner to action_view	Piotr Sarnacki	2012-08-28	3	-3/+4
\|/
*	Get rid of config.preload_frameworks in favor of config.eager_load_namespaces	José Valim	2012-08-21	1	-0/+2
*	Make sure :via works with mount	Pratik Naik	2012-08-20	1	-2/+3
*	Added X-Content-Type-Options to the header defaults.	Jim Jones	2012-08-18	1	-1/+2
*	Add Request#formats=(extensions) that lets you set multiple formats directly ...	David Heinemeier Hansson	2012-08-14	1	-0/+21
*	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
*	push header merge down to a private method so that live responses can have th...	Aaron Patterson	2012-08-13	1	-3/+7
*	Merge pull request #7329 from guilleiguaran/move-default-headers-ad-railtie	Rafael Mendonça França	2012-08-10	1	-0/+5
\|\
\| *	Move AD default_headers configurations to railtie	Guillermo Iguaran	2012-08-10	1	-0/+5
* \|	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
*	Merge pull request #7321 from bogdan/refactor_routes_set	Santiago Pastorino	2012-08-10	1	-10/+7
\|\
\| *	RouteSet: refactor internals	Bogdan Gusiev	2012-08-10	1	-10/+7
* \|	Merge pull request #7302 from homakov/default_headers	Aaron Patterson	2012-08-09	2	-0/+6
\|\ \
\| * \|	introduce default_headers config	Egor Homakov	2012-08-09	2	-0/+6
\| \|/
* /	initialize instance variables	Aaron Patterson	2012-08-09	3	-0/+22
\|/
*	removes usage of Object#in? from the code base (the method remains defined by...	Xavier Noria	2012-08-06	1	-1/+1
*	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/module/delegation in active_support/rails	Xavier Noria	2012-08-02	2	-2/+0
* \|	load active_support/core_ext/object/inclusion in active_support/rails	Xavier Noria	2012-08-02	3	-3/+0
* \|	load active_support/core_ext/object/blank in active_support/rails	Xavier Noria	2012-08-02	11	-11/+0
* \|	Merge pull request #7198 from cfcosta/refactor-cache_control_headers	Rafael Mendonça França	2012-07-29	1	-11/+19
\|\ \