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

	Commit message (Expand)	Author	Age	Files	Lines
*	Support controller tests using spec DSL - fixes #7743	Mike Moore	2012-09-24	2	-3/+121
*	Create ActiveSupport::Testing::ConstantLookup	Mike Moore	2012-09-24	3	-0/+113
*	Merge pull request #6936 from jfoley/callbacks	Santiago Pastorino	2012-09-24	4	-2/+78
\|\
\| *	Add CHANGELOG entry and update the guide	John Foley	2012-09-23	2	-0/+23
\| *	Switch to using include? on validation callbacks	John Foley	2012-09-23	1	-2/+2
\| *	Fix collisions with before and after validation callbacks.	John Foley	2012-09-23	2	-2/+55
* \|	Merge pull request #7742 from GRoguelon/master	Santiago Pastorino	2012-09-24	1	-1/+0
\|\ \
\| * \|	Remove of an extra line in template configuration file.	Geoffrey Roguelon	2012-09-24	1	-1/+0
* \| \|	make clear that expired db/schema_cache.dump are ignored	Xavier Noria	2012-09-24	1	-1/+1
* \| \|	adds the release notes for Rails 4.0 to the guides index	Xavier Noria	2012-09-24	1	-0/+4
\|/ /
* \|	Merge pull request #7741 from siong1987/testing	Vijay Dev	2012-09-23	1	-2/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Update Performance Testing guide.	Teng Siong Ong	2012-09-23	1	-2/+1
\|/
*	Merge pull request #7740 from BMorearty/dont-sort-params	José Valim	2012-09-23	2	-2/+2
\|\
\| *	Update test to match new non-sorting of attributes.	Brian Morearty	2012-09-23	1	-1/+1
\| *	Removed sorting of attribute names in controller generator.	Brian Morearty	2012-09-23	1	-1/+1
\|/
*	Merge pull request #7737 from siong1987/debugging	Vijay Dev	2012-09-23	1	-3/+1
\|\
\| *	[ci skip] Update Debugging Rails Application guide.	Teng Siong Ong	2012-09-22	1	-3/+1
* \|	fixes the suite for uploaded files	Xavier Noria	2012-09-23	1	-6/+6
\|/
*	documents ActionDispatch::Http::UploadedFile	Xavier Noria	2012-09-22	1	-6/+55
*	Put the new CHANGELOG entries always in the top [ci skip]	Rafael Mendonça França	2012-09-22	1	-8/+10
*	Merge pull request #7713 from porras/action-dispatch-upload-delegates-close-t...	Xavier Noria	2012-09-22	3	-6/+16
\|\
\| *	Accept parameters in methods delegated to tempfile	Sergio Gil Pérez de la Manga	2012-09-22	2	-6/+8
\| *	Update CHANGELOG.md	Sergio Gil Pérez de la Manga	2012-09-21	1	-0/+2
\| *	Delegate ActionDispatch::Http::UploadedFile#close to tempfile	Sergio Gil Pérez de la Manga	2012-09-20	2	-1/+7
* \|	Fix test_find_in_batches_should_use_any_column_as_primary_key	Santiago Pastorino	2012-09-22	1	-11/+8
* \|	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