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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-12-04	39	-392/+435
\|\
\| *	copy edits [ci skip]	Vijay Dev	2012-12-04	4	-27/+18
\| *	Revert "Add documentation to TransactionIsolationError [ci skip]"	Vijay Dev	2012-12-04	1	-2/+0
\| *	Fix a typo in ActionController::Caching	Jean Boussier	2012-12-03	1	-2/+1
\| *	fix some formatting	1334	2012-12-03	1	-2/+2
\| *	Fix typo.	Hendy Tanata	2012-12-03	1	-2/+2
\| *	grammar improvements for increment_counter and decrement_counter docs	Matthew Robertson	2012-12-02	1	-6/+8
\| *	increment_counter and decrement_counter can accept and array of ids as an arg	Matthew Robertson	2012-12-02	1	-2/+2
\| *	added full file path in all file references	Yoni Yalovitsky	2012-12-03	1	-9/+9
\| *	removed an extra slash before the 'app' dir	Yoni Yalovitsky	2012-12-03	1	-1/+1
\| *	Standardize use of "route globbing" and "wildcard segments" [ci skip]	Pablo Torres	2012-12-02	1	-3/+3
\| *	Add counterexample for regex [ci skip]	Pablo Torres	2012-12-02	1	-1/+1
\| *	Convert parragraph about security to a NOTE [ci skip]	Pablo Torres	2012-12-02	1	-1/+1
\| *	Add clarity to static segments docs in non-resourceful routes [ci skip]	Pablo Torres	2012-12-02	1	-1/+1
\| *	Correct grammar [ci skip]	Pablo Torres	2012-12-02	1	-3/+3
\| *	Convert a section to a tip to highlight it [ci skip]	Pablo Torres	2012-12-02	1	-3/+1
\| *	Normalize use of colon before code examples in routing guide [ci skip]	Pablo Torres	2012-12-02	1	-32/+32
\| *	Show equivalent routes definition without using concerns [ci skip]	Pablo Torres	2012-12-02	1	-0/+13
\| *	Clarify section titles [ci skip]	Pablo Torres	2012-12-02	1	-2/+2
\| *	Move note to a meaningful section in the guides [ci skip]	Pablo Torres	2012-12-02	1	-2/+2
\| *	Use correct conjunction and connector words [ci skip]	Pablo Torres	2012-12-02	1	-3/+5
\| *	match text with translation file example	Chris Walquist	2012-12-02	1	-1/+1
\| *	Capitalize all table column titles in routing guide	Pablo Torres	2012-12-02	1	-8/+8
\| *	List instructions in the order to be executed	Pablo Torres	2012-12-02	1	-3/+1
\| *	Add shallow nesting to the routing guide	Pablo Torres	2012-12-02	1	-0/+85
\| *	Remove nodoc from FlashHash #[]= [ci skip]	Pablo Torres	2012-12-01	1	-1/+1
\| *	Cleans and removes 'Examples' tag [ci skip]	Alvaro Pereyra	2012-12-01	6	-13/+4
\| *	Cleans and removes useless 'Examples' tag [ci skip]	Alvaro Pereyra	2012-12-01	8	-71/+46
\| *	nodoc AS::Testing::ConstantLookup::ClassMethods [ci skip]	Carlos Duclos	2012-12-01	1	-1/+1
\| *	Add documentation for Hash.from_xml [ci skip]	HPNeo	2012-12-01	1	-0/+13
\| *	Add documentation to AssetTagHelper#image_alt [ci skip]	Florent Guilleux	2012-12-01	1	-0/+3
\| *	update AR::Schema docs [ci skip]	Carlos Duclos	2012-12-01	1	-1/+6
\| *	Fixes wrong typo on FormHelper [ci skip]	Alvaro Pereyra	2012-12-01	1	-1/+1
\| *	Cleans documentation from Helpers [ci skip]	Alvaro Pereyra	2012-12-01	5	-121/+98
\| *	Revert "Remove trailing whitespaces"	Florent Guilleux	2012-12-01	28	-59/+61
\| *	Remove trailing whitespaces	Florent Guilleux	2012-12-01	28	-61/+59
\| *	Add documentation to TransactionIsolationError [ci skip]	Florent Guilleux	2012-12-01	1	-0/+2
\| *	Improves documentation of Capture helper [ci skip]	Alvaro Pereyra	2012-12-01	2	-14/+13
\| *	Removes :nodoc: tag on AtomFeedHelper [ci skip]	Alvaro Pereyra	2012-12-01	1	-3/+3
\| *	Removes unneeded 'Example' tags and whitespaces [ci skip]	Alvaro Pereyra	2012-12-01	1	-45/+42
\| *	nodoc AD & AV railties classes	Carlos Duclos	2012-12-01	2	-2/+2
\| *	Remove :nodoc from SanitizeHelper module [ci skip]	HPNeo	2012-12-01	1	-1/+1
\| *	nodoc AS::Testing::Pending because is deprecated [ci skip]	Carlos Duclos	2012-12-01	1	-2/+2
\| *	Removes :nodoc: label [ci skip]	Alvaro Pereyra	2012-12-01	1	-1/+1
\| *	Improves documentation on favicon_link_tag	Alvaro Pereyra	2012-12-01	1	-14/+16
\| *	remove unneeded Examples tag [ci skip]	Carlos Duclos	2012-12-01	1	-10/+0
\| *	Update documentation for javascript_include_tag [ci skip]	HPNeo	2012-12-01	1	-10/+13
* \|	Updated 4.0 release notes	Vijay Dev	2012-12-04	2	-818/+49
* \|	Merge pull request #8416 from kennyj/redundant_pg_namespace	Rafael Mendonça França	2012-12-04	1	-1/+0
\|\ \
\| * \|	pg_namespace table isn't used.	kennyj	2012-12-05	1	-1/+0
\|/ /