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	5	-69/+165
\|\
\| *	fix some formatting	1334	2012-12-03	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
* \|	Updated 4.0 release notes	Vijay Dev	2012-12-04	1	-818/+49
* \|	Fix wrong doc and message about rails profiler.	kennyj	2012-12-04	1	-2/+2
* \|	Merge pull request #8375 from steveklabnik/migrations_guide	Xavier Noria	2012-12-03	1	-365/+217
\|\ \
\| * \|	Migration Guide: General fix-up	Steve Klabnik	2012-12-01	1	-365/+217
* \| \|	Add Mailer Callback section to Mailer guides	Aditya Sanghi	2012-12-02	1	-1/+52
\|/ /
* /	Here's a few updates to the validations guide. A bunch of small changes,	Steve Klabnik	2012-12-01	1	-347/+342
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-12-01	37	-252/+280
\|\
\| *	Normalize on 'After reading this guide, you will know:'	Steve Klabnik	2012-11-29	37	-28/+80
\| *	Asset Pipeline: add 'the'	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Command Line: remove 'A Guide to'	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Migrations: add 'Active Record' to title	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Fix title of 'form helpers' guide.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Associations: s/A Guide//	Steve Klabnik	2012-11-29	1	-2/+2
\| *	Remove 'This guide is based on ' warnings.	Steve Klabnik	2012-11-29	4	-9/+0
\| *	Add periods to the bullet points in guides.	Steve Klabnik	2012-11-29	28	-126/+126
\| *	Migrations: Fix opening bullets.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionView -> Action View	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionController -> Action Controller	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActiveSupport -> Active Support	Steve Klabnik	2012-11-29	1	-4/+4
\| *	ActionMailer -> Action Mailer.	Steve Klabnik	2012-11-29	1	-2/+2
\| *	ActionPack -> Action Pack.	Steve Klabnik	2012-11-29	1	-1/+1
\| *	ActiveRecord -> Active Record	Steve Klabnik	2012-11-29	5	-6/+6
\| *	Migrations: move massive paragraph out of intro.	Steve Klabnik	2012-11-29	1	-10/+19
\| *	Getting Started: Improve instructions on opening a terminal	Steve Klabnik	2012-11-29	1	-1/+4
\| *	Getting Started: remove reference to attr_accessible	Steve Klabnik	2012-11-29	1	-11/+0
\| *	Getting Started: mac -> Mac OS X	Steve Klabnik	2012-11-29	1	-1/+1
\| *	Getting Started: Rails 3.2 -> Rails 4.	Steve Klabnik	2012-11-29	1	-1/+1
\| *	Revert "correct css selector for the display of validation error messages: ch...	Xavier Noria	2012-11-28	1	-4/+4
\| *	Clarifies the cookie store docs a bit and uses correct Markdown syntax for pr...	Andy Lindeman	2012-11-27	1	-1/+1
\| *	Adding a note about :inverse_of for validations.	Steve Klabnik	2012-11-27	1	-0/+8
\| *	Fix validation based on object not _id.	Steve Klabnik	2012-11-27	1	-2/+2