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

	Commit message (Expand)	Author	Age	Files	Lines
*	remove unused ivar	Aaron Patterson	2012-05-02	1	-4/+3
*	use hash fetches to populate the :id value	Aaron Patterson	2012-05-02	1	-12/+7
*	imported options, switched to object composition	Aaron Patterson	2012-05-02	1	-13/+56
*	* move exception message to exception constructor	Aaron Patterson	2012-05-02	1	-5/+11
*	ActionPack routes: remove some useless code.	Bogdan Gusiev	2012-05-02	1	-26/+4
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-01	4	-17/+15
\|\
\| *	Fix rdoc formatting in Mime::Type	Mark Rushakoff	2012-04-29	1	-5/+5
\| *	Reword polymorphic routes + mounted engine rdoc	Mark Rushakoff	2012-04-29	1	-8/+6
\| *	Code-format references to config settings	Mark Rushakoff	2012-04-27	2	-2/+2
\| *	More using <tt>x</tt> instead of +x+ when the latter renders improperly.	Mark Rushakoff	2012-04-27	1	-2/+2
* \|	Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores	José Valim	2012-04-30	1	-0/+7
\|\ \
\| * \|	Support cookie jar options for all cookie stores	brainopia	2012-04-30	1	-0/+7
\| \|/
* \|	Merge pull request #6082 from brainopia/smarter_cookie_jar	José Valim	2012-04-30	1	-7/+10
\|\ \
\| * \|	Dont stream back cookie value if it was set to the same value	brainopia	2012-04-30	1	-4/+6
\| * \|	Dont set cookie header for deletion of unexisting data	brainopia	2012-04-30	1	-1/+2
\| * \|	Simplify matching with array of possible domains	brainopia	2012-04-30	1	-1/+1
\| * \|	Use more appropriate one-liner for class declaration	brainopia	2012-04-30	1	-1/+1
* \| \|	Merge pull request #6083 from brainopia/remove_unused_closed_ivars	José Valim	2012-04-30	2	-2/+0
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove unused ivars left from close checks	brainopia	2012-04-30	2	-2/+0
\| \|/
* \|	Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every...	Piotr Sarnacki	2012-04-30	1	-6/+3
\|\ \
\| * \|	fix the Flash middleware loading the session on every request (very dangerous...	Will Bryant	2012-04-28	1	-6/+3
\| \|/
* \|	Merge pull request #6074 from mark-rushakoff/unused-variables	Jeremy Kemper	2012-04-29	1	-1/+0
\|\ \
\| * \|	Remove unused assignments	Mark Rushakoff	2012-04-29	1	-1/+0
\| \|/
* \|	Restore interpolation of path option in redirect routes	Andrew White	2012-04-29	1	-0/+10
* \|	Escape interpolated params when redirecting - fixes #5688	Andrew White	2012-04-29	1	-1/+7
\|/
*	Shadowing variable warning removed	Arun Agrawal	2012-04-26	1	-3/+3
*	Allow loading external route files from the router	Jose and Yehuda	2012-04-25	2	-0/+18
*	Merge pull request #5980 from gazay/valid_ips	Jeremy Kemper	2012-04-25	1	-22/+68
\|\
\| *	Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...	Alexey Gaziev	2012-04-25	1	-22/+68
* \|	Remove unnecessary empty line	José Valim	2012-04-25	1	-1/+0
* \|	Remove default match without specified method	Jose and Yehuda	2012-04-24	1	-2/+12
* \|	Merge pull request #5961 from bogdan/routes	Jeremy Kemper	2012-04-24	1	-20/+26
\|\ \
\| * \|	ActionDispatch::HTTP::Url#url_for refactor method	Bogdan Gusiev	2012-04-24	1	-20/+26
* \| \|	Refactor hash creation in routeset	Carlos Antonio da Silva	2012-04-24	1	-3/+4
\|/ /
* \|	RouteSet: decomplecting a way to handle positional args	Bogdan Gusiev	2012-04-24	1	-26/+20
* \|	RouteSet: simplify routes helpers generation code	Bogdan Gusiev	2012-04-24	1	-13/+21
* \|	Add missing requires in routes	Bogdan Gusiev	2012-04-23	2	-0/+3
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-21	1	-2/+2
\|\
\| *	Fix formatting	Oscar Del Ben	2012-04-18	1	-2/+2
* \|	Freeze the middleware stack after it's built	Jeremy Kemper	2012-04-20	1	-1/+1
\|/
*	let's keep the slash in the return value instead of the path variable [ci skip]	Vijay Dev	2012-04-18	1	-2/+2
*	Warn about do end syntax in redirect option	Oscar Del Ben	2012-04-17	1	-0/+3
*	Fix redirect with block example	Alexey Vakhov	2012-04-17	1	-3/+3
*	Fix example in flash middleware	Alexey Vakhov	2012-04-17	1	-1/+1
*	Fix comment in AD http response	Alexey Vakhov	2012-04-13	1	-1/+1
*	Revert "Merge pull request #5750 from ahoward/master"	Santiago Pastorino	2012-04-08	1	-10/+1
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-07	1	-1/+1
\|\
\| *	Fix example action dispatch in mime type	Alexey Vakhov	2012-04-07	1	-1/+1
* \|	documents the contract for the argument of AD::Routing::RouteSet#url_for	Xavier Noria	2012-04-05	1	-0/+1
* \|	Make url_for work when option is nil and default_url_options has	Rafael Mendonça França	2012-04-05	1	-1/+1