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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7728 from guilleiguaran/fix-asset-test	Santiago Pastorino	2012-09-21	1	-2/+5
\|\
\| *	Update asset test to match one in sprockets-rails	Guillermo Iguaran	2012-09-21	1	-2/+5
\|/
*	Merge pull request #7726 from jcorcuera/master	Santiago Pastorino	2012-09-21	3	-3/+3
\|\
\| *	Remove .rb from require sentences	José Corcuera Z	2012-09-21	3	-3/+3
* \|	Use debugger gem if we are not Travis and Ruby < 2.0	Santiago Pastorino	2012-09-21	1	-1/+1
* \|	Add debugger to mri:test section of the Gemfile	Santiago Pastorino	2012-09-21	1	-0/+1
* \|	start could be a string	Santiago Pastorino	2012-09-21	2	-3/+3
* \|	Revert "Fix find_in_batches with customized primary_key"	Santiago Pastorino	2012-09-21	4	-28/+11
* \|	Raise the same exception the code is handling	Santiago Pastorino	2012-09-21	1	-1/+1
\|/
*	Revert "update ActionMailer::Base documentation [ci skip]"	Rafael Mendonça França	2012-09-21	1	-258/+216
*	Style: remove hash noise	Jeremy Kemper	2012-09-21	1	-10/+10
*	Correct default charset/collation for mysql dbs	Jeremy Kemper	2012-09-21	2	-15/+30
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-22	3	-67/+67
\|\
\| *	Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip]	José Corcuera	2012-09-21	1	-61/+61
\| *	Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip]	José Corcuera	2012-09-21	1	-4/+4
\| *	Update examples in AS::Concern to use correct scope syntax. [ci skip]	José Corcuera	2012-09-21	1	-2/+2
* \|	Use default charset/collation only if neither is specified. Otherwise we se...	Jeremy Kemper	2012-09-21	1	-4/+7
* \|	some edits in 4.0 release notes [ci skip]	Vijay Dev	2012-09-22	1	-9/+10
* \|	Fix typos and links in engines guide [ci skip]	Vijay Dev	2012-09-21	1	-3/+2
* \|	fix some md syntax errors and general revisions [ci skip]	Vijay Dev	2012-09-21	3	-20/+19
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-21	95	-1174/+1339
\|\
\| *	remove nodoc [ci skip]	Vijay Dev	2012-09-21	1	-1/+1
\| *	Updated description of what engines are used for	Stephan Hagemann	2012-09-21	1	-2/+2
\| *	Revert "Fix MIME type in CHANGELOG"	Jo Liss	2012-09-21	1	-1/+1
\| *	Fix MIME type in CHANGELOG	Jo Liss	2012-09-21	1	-1/+1
\| *	Add extra note about :dependent => :destroy.	Steve Klabnik	2012-09-21	1	-1/+4
\| *	correct a typo	Przemek Hocke	2012-09-21	1	-1/+1
\| *	Add missing "m" char	Przemek Hocke	2012-09-21	1	-1/+1
\| *	fix two typos in the associations guide	Przemek Hocke	2012-09-21	1	-2/+2
\| *	fix a small typo	Przemek Hocke	2012-09-21	1	-1/+1
\| *	Fix indentation and update documentation for Array#wrap for Ruby 1.9	Jo Liss	2012-09-20	1	-9/+10
\| *	fix :nodoc:s in AR::Timestamp [ci skip]	Francesco Rodriguez	2012-09-19	1	-7/+7
\| *	fix Hash#slice code example [ci skip]	Francesco Rodriguez	2012-09-18	2	-2/+2
\| *	Update 3.0 -> 3.1 session information.	Steve Klabnik	2012-09-18	1	-0/+13
\| *	Expanded note about poly associations.	Steve Klabnik	2012-09-18	1	-3/+12
\| *	update ActionMailer documentation [ci skip]	Francesco Rodriguez	2012-09-17	5	-18/+15
\| *	Add note about inheretance and poly associations.	Steve Klabnik	2012-09-17	1	-0/+4
\| *	update ActionMailer::Base documentation [ci skip]	Francesco Rodriguez	2012-09-17	1	-266/+323
\| *	update code examples to 1.9 hash syntax in the AR/README [ci skip]	Francesco Rodriguez	2012-09-17	1	-12/+12
\| *	update AS docs [ci skip]	Francesco Rodriguez	2012-09-17	23	-329/+378
\| *	fix AS::OrderedOptions documentation [ci skip]	Francesco Rodriguez	2012-09-17	1	-16/+15
\| *	Update "Getting Started" guide	Simon Hengel	2012-09-16	1	-1/+1
\| *	Doc typo: depenent -> dependent; trailing ws.	Henrik N	2012-09-16	1	-2/+2
\| *	Improve documentation about :dependent and callbacks.	Steve Klabnik	2012-09-15	1	-0/+5
\| *	update AS/values and AS/xml_mini docs [ci skip]	Francesco Rodriguez	2012-09-14	4	-39/+54
\| *	update AS/notifications and AS/testing docs [ci skip]	Francesco Rodriguez	2012-09-14	3	-8/+10
\| *	update AS/log_subscriber and AS/multibyte docs [ci skip]	Francesco Rodriguez	2012-09-14	3	-55/+76
\| *	update AS/json docs [ci skip]	Francesco Rodriguez	2012-09-14	2	-12/+20
\| *	update AS/inflector docs [ci skip]	Francesco Rodriguez	2012-09-14	3	-142/+167
\| *	update AS/deprecation docs [ci skip]	Francesco Rodriguez	2012-09-14	2	-9/+9