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

	Commit message (Expand)	Author	Age	Files	Lines
*	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	4	-4/+4
*	More using <tt>x</tt> instead of +x+ when the latter renders improperly.	Mark Rushakoff	2012-04-27	2	-3/+3
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-28	2	-4/+4
\|\
\| *	Use <tt>Foo::Bar</tt> instead of +Foo::Bar+	Mark Rushakof	2012-04-27	2	-4/+4
* \|	Merge pull request #5989 from arunagw/warning_removed_master_ap	Jon Leighton	2012-04-27	1	-3/+3
\|\ \
\| * \|	Shadowing variable warning removed	Arun Agrawal	2012-04-26	1	-3/+3
* \| \|	refactor content_tag_for helper	Sergey Nartimov	2012-04-26	1	-3/+3
* \| \|	use safe_join in number helper	Sergey Nartimov	2012-04-26	1	-1/+1
* \| \|	remove unnecessary else statement	Vasiliy Ermolovich	2012-04-26	1	-3/+3
* \| \|	fix number_to_human docs [ci skip]	Vijay Dev	2012-04-26	1	-2/+2
\|/ /
* /	Allow loading external route files from the router	Jose and Yehuda	2012-04-25	2	-0/+18
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-25	2	-1/+4
\|\
\| *	Missed checked in Form Helper example	Alexey Vakhov	2012-04-24	1	-1/+1
\| *	Add distance_of_time_in_words example for seconds	Alexey Vakhov	2012-04-22	1	-0/+3
* \|	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
* \| \|	Merge pull request #5927 from avakhov/distance_of_time_in_words-swap	Jeremy Kemper	2012-04-24	1	-14/+19
\|\ \ \
\| * \| \|	Use leap years trick in distance_of_time_in_words only for distances between ...	Alexey Vakhov	2012-04-24	1	-12/+16
\| * \| \|	fixed non matching documentation behaviour with method semantics on distance_...	Marcelo Casiraghi	2012-04-24	1	-1/+1
\| * \| \|	Distance of time in words should work correct if from time > to_time	Alexey Vakhov	2012-04-24	1	-2/+3
* \| \| \|	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	3	-4/+4
\|\
\| *	Comma missed	Alexey Vakhov	2012-04-21	1	-1/+1
\| *	Fix example in ActionView::Helpers::FormHelper	Thibaut Courouble	2012-04-20	1	-1/+1
\| *	Fix formatting	Oscar Del Ben	2012-04-18	1	-2/+2
* \|	Merge pull request #5865 from tiegz/minor_fixes	Aaron Patterson	2012-04-20	1	-1/+1
\|\ \
\| * \|	converting some tests to assert_raises, and DRY'ing retrieve_variable changes	Tieg Zaharia	2012-04-16	1	-1/+1
\| * \|	catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead	Tieg Zaharia	2012-04-16	1	-1/+1
* \| \|	Freeze the middleware stack after it's built	Jeremy Kemper	2012-04-20	1	-1/+1
\| \|/ \|/\|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-18	4	-6/+9
\|\ \ \| \|/ \|/\|
\| *	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
\| *	Fix HTML sanitizer allowed_css_properties comment	Alexey Vakhov	2012-04-13	1	-1/+1
* \|	Merge pull request #5814 from lest/patch-4	Piotr Sarnacki	2012-04-13	1	-12/+13
\|\ \
\| * \|	don't duplicate default values in text helper	Sergey Nartimov	2012-04-11	1	-12/+13
* \| \|	Remove obsolete code	Alexey Vakhov	2012-04-12	1	-3/+0
* \| \|	#send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...	Jeremy Kemper	2012-04-12	1	-1/+21
\| \|/ \|/\|
* \|	avoid autolinking by rdoc [ci skip]	Vijay Dev	2012-04-12	1	-2/+2
* \|	Merge pull request #5746 from jmbejar/index_method_form_builder	Santiago Pastorino	2012-04-11	1	-5/+22
\|\ \ \| \|/ \|/\|