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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #14909 from jonatack/patch-7	Arthur Nogueira Neves	2014-04-29	1	-2/+2
\|\
\| *	the use of ... in place >> using ... instead	Jon Atack	2014-04-30	1	-2/+2
\|/
*	rewrites the API docs of favicon_link_tag [ci skip]	Xavier Noria	2014-04-29	1	-9/+16
*	Merge pull request #14905 from jonatack/patch-7	Vijay Dev	2014-04-29	1	-36/+159
\|\
\| *	Update the Getting Started tutorial	Jon Atack	2014-04-29	1	-36/+159
* \|	cleanup, remove trailing whitespace. [ci skip]	Yves Senn	2014-04-29	1	-1/+1
\|/
*	Merge pull request #14899 from eileencodes/fix-delete-all-with-nil-dependency...	Aaron Patterson	2014-04-28	4	-8/+18
\|\
\| *	add test to check that loaded and non laoded are the same	eileencodes	2014-04-28	1	-0/+13
\| *	clear shouldnt fire callbacks so remove order test	eileencodes	2014-04-28	1	-3/+0
\| *	rewrite test to correctly test clear method	eileencodes	2014-04-28	1	-2/+2
\| *	flip conditional in delete_all to handle nullify better	eileencodes	2014-04-28	1	-3/+3
* \|	Merge pull request #14139 from anilmaurya/master	Yves Senn	2014-04-28	1	-0/+6
\|\ \ \| \|/ \|/\|
\| *	[ci skip] updating active_record/associations to demonstrate where conflict w...	anilmaurya	2014-04-29	1	-0/+6
* \|	Merge pull request #14892 from eileencodes/breakup-complex-conditionals-on-de...	Aaron Patterson	2014-04-28	1	-9/+9
\|\ \
\| * \|	simplify the delete all w/ dependency method	eileencodes	2014-04-28	1	-3/+3
\| * \|	remove unnecessary code from delete method	eileencodes	2014-04-28	1	-10/+2
\| * \|	write a new method to be accessed from delete_all	eileencodes	2014-04-28	1	-1/+9
\|/ /
* \|	Merge pull request #14890 from fuzzyalej/patch-1	Arthur Nogueira Neves	2014-04-28	1	-0/+1
\|\ \
\| * \|	Added a missing `end`	Alejandro Andrés	2014-04-28	1	-0/+1
\|/ /
* \|	Merge pull request #14889 from kiela/master	Arthur Nogueira Neves	2014-04-28	1	-1/+0
\|\ \
\| * \|	Remove double declaration of memcache services on travis	Kamil Kieliszczyk	2014-04-28	1	-1/+0
\|/ /
* \|	Revert "Don't rely on Arel master in bug report template [ci skip]"	Godfrey Chan	2014-04-27	1	-0/+1
* \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2014-04-27	2	-1/+55
\|\ \
\| * \|	Revert "Running AR tests on postgres, mysql & sqlite"	Vijay Dev	2014-04-27	1	-5/+10
\| * \|	Revert "Document ActionController::TestCase::Behavior::ClassMethods.process"	Vijay Dev	2014-04-27	1	-12/+0
\| * \|	Revert "Revert "Revert "update doc, assert_template also accepts false"""	Xavier Noria	2014-04-21	1	-1/+1
\| * \|	Revert "Revert "update doc, assert_template also accepts false""	Xavier Noria	2014-04-21	1	-1/+1
\| * \|	Revert "update doc, assert_template also accepts false"	Gaurish Sharma	2014-04-21	1	-1/+1
\| * \|	Running AR tests on postgres, mysql & sqlite	Gaurish Sharma	2014-04-21	1	-10/+5
\| * \|	Document ActionController::TestCase::Behavior::ClassMethods.process	Gaurish Sharma	2014-04-20	1	-0/+12
\| * \|	update doc, assert_template also accepts false	Gaurish Sharma	2014-04-20	1	-1/+1
\| * \|	Remove reference to outdated section	Gaurish Sharma	2014-04-20	1	-1/+1
\| * \|	[ci skip] Added example for number_field_tag method	ZENATI YASSINE	2014-04-19	1	-0/+28
\| * \|	[ci skip] Added example for date_field_tag method	ZENATI YASSINE	2014-04-19	1	-0/+13
\| * \|	[ci skip] Added example for email_field_tag method	ZENATI YASSINE	2014-04-19	1	-0/+13
* \| \|	Generators, remove leftover variable assignment. refs #14877	Yves Senn	2014-04-27	1	-1/+0
* \| \|	Merge pull request #14872 from jonatack/patch-7	Vijay Dev	2014-04-27	1	-6/+11
\|\ \ \
\| * \| \|	Grammar and formatting fixes in Form Helpers Guide	Jon Atack	2014-04-25	1	-6/+11
* \| \| \|	Merge pull request #14874 from arunagw/aa-warning-removed-missmatched	Guillermo Iguaran	2014-04-26	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Warning removed for missmatched indentation	Arun Agrawal	2014-04-26	1	-2/+2
* \| \| \| \|	Merge pull request #14875 from prathamesh-sonpatki/fix-extract-handler-format...	Lauro Caetano	2014-04-25	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix documentation of extract_handler_and_format_and_variant [ci skip]	Prathamesh Sonpatki	2014-04-26	1	-1/+1
* \| \| \| \|	Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm	Yves Senn	2014-04-25	4	-2/+15
\|\ \ \ \ \
\| * \| \| \| \|	Fix custom join_table name on habtm reflections	Kassio Borges	2014-04-25	4	-2/+15
\| \|/ / / /
* \| \| \| \|	Merge pull request #14873 from jonatack/patch-8	Yves Senn	2014-04-25	1	-5/+5
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fix code & grammar in Form Helpers Guide	Jon Atack	2014-04-25	1	-5/+5
\|/ / / /
* \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-25	39	-380/+634
\|\\| \| \|
\| * \| \|	move AR length validation tests into separate test-case.	Yves Senn	2014-04-24	2	-42/+48
\| * \| \|	No need for trailing slash on migration path.	Jeremy Kemper	2014-04-24	1	-1/+1
\| * \| \|	reset `@arel` when modifying a Relation in place.	Yves Senn	2014-04-24	3	-1/+18