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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'bindwhere'	Aaron Patterson	2013-05-21	2	-20/+42
\|\
\| *	avoid creating a set if no where values are removed	Aaron Patterson	2013-05-21	2	-0/+14
\| *	remove bind values for where clauses that were removed	Aaron Patterson	2013-05-21	2	-9/+18
\| *	push partitioning up so bind elimination can get the removed wheres	Aaron Patterson	2013-05-21	1	-5/+3
\| *	push partion logic down and initialization logic up	Aaron Patterson	2013-05-21	1	-15/+11
\| *	partition the where values so we can access the removed ones	Aaron Patterson	2013-05-20	1	-1/+6
* \|	Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_config	Rafael Mendonça França	2013-05-21	1	-1/+1
\|\ \
\| * \|	the rake task `db:test:prepare` needs to load the configuration	Yves Senn	2013-05-21	1	-1/+1
\| \|/
* \|	Merge pull request #10702 from divineforest/use-total-in-batches-test	Carlos Antonio da Silva	2013-05-21	1	-7/+5
\|\ \ \| \|/ \|/\|
\| *	In batches test @total was assigned but not used. Use it in tests instead of ...	Alexander Balashov	2013-05-21	1	-7/+5
\|/
*	eliminate some conditionals	Aaron Patterson	2013-05-20	1	-3/+3
*	change method name to reflect what it actually does.	Aaron Patterson	2013-05-20	1	-2/+2
*	save the where values in variables so we don't need to look them up all	Aaron Patterson	2013-05-20	1	-4/+5
*	pass where values to the helper function rather than rely on internal state	Aaron Patterson	2013-05-20	1	-4/+4
*	Merge pull request #10697 from zhubert/patch-1	Steve Klabnik	2013-05-20	1	-1/+1
\|\
\| *	Spelling correction in Upgrading Guide	Zack Hubert	2013-05-20	1	-1/+1
\|/
*	Add has_named_route? to the mapper API	José Valim	2013-05-20	2	-0/+18
*	No need CHANGELOG entry for a test fix	Rafael Mendonça França	2013-05-20	1	-4/+1
*	Merge pull request #10646 from kennyj/fix_am_20130517	Rafael Mendonça França	2013-05-20	2	-2/+5
\|\
\| *	Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.	kennyj	2013-05-17	2	-2/+5
* \|	Merge pull request #10692 from vipulnsward/fix_test_3	José Valim	2013-05-19	1	-1/+1
\|\ \
\| * \|	Fix wrong `case_sensitive` in uniqueness validity test	Vipul A M	2013-05-20	1	-1/+1
* \| \|	Merge pull request #10691 from vipulnsward/typo_fix_ar_1	Steve Klabnik	2013-05-19	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix typo in test name and documentation	Vipul A M	2013-05-20	2	-2/+2
\|/ /
* \|	Merge pull request #10688 from elgalu/master	Rafael Mendonça França	2013-05-19	1	-0/+1
\|\ \
\| * \|	Missing ending ``` at 14.2 Merging of scopes	Leo Gallucci	2013-05-19	1	-0/+1
\|/ /
* \|	Merge pull request #10659 from vipulnsward/normalize_param2	Rafael Mendonça França	2013-05-19	1	-3/+3
\|\ \
\| * \|	"normalize_callback_params" doesn't require name param	Vipul A M	2013-05-17	1	-3/+3
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2013-05-19	14	-25/+77
\|\ \ \
\| * \| \|	copy edits[ci skip]	Vijay Dev	2013-05-19	3	-15/+10
\| * \| \|	Revert "Corrected documentation and added some more for the classify method i...	Vijay Dev	2013-05-19	1	-14/+5
\| * \| \|	Revert "Changed the CHANGELOG for active_support and improved the doc for inf...	Vijay Dev	2013-05-19	2	-9/+8
\| * \| \|	Revert "ActionMailer::Collector should be nodoc'd"	Vijay Dev	2013-05-19	1	-1/+1
\| * \| \|	Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"	Vijay Dev	2013-05-19	9	-9/+9
\| * \| \|	Revert "Document Rails::Generators::MailerGenerator"	Vijay Dev	2013-05-19	1	-4/+2
\| * \| \|	Changed the CHANGELOG for active_support and improved the doc for inflector m...	aditya-kapoor	2013-05-19	2	-8/+9
\| * \| \|	Fix documentation for ActionMailer template names.	Megan Bowra-Dean	2013-05-17	1	-4/+4
\| * \| \|	Merge pull request #137 from zduci/master	Radu Busuioc	2013-05-16	1	-7/+7
\| \|\ \ \
\| \| * \| \|	Corrected documentation regarding validation errors	Radu Busuioc	2013-05-16	1	-7/+7
\| \|/ / /
\| * \| \|	Corrected documentation and added some more for the classify method in inflec...	aditya-kapoor	2013-05-16	1	-5/+14
\| * \| \|	Added some more documentation for define_readers and define_writer of the Ass...	aditya-kapoor	2013-05-15	3	-0/+15
\| * \| \|	Added some more documentation for ActiveRecord::Associations::Builder::Associ...	aditya-kapoor	2013-05-15	1	-0/+11
\| * \| \|	Added documentation for ActiveRecord::Associations::Builder::Association class	aditya-kapoor	2013-05-15	1	-0/+4
\| * \| \|	Document Rails::Generators::MailerGenerator	Zachary Scott	2013-05-15	1	-2/+4
\| * \| \|	nodoc ActionMailer module from lib/action_mailer/*.rb	Zachary Scott	2013-05-15	9	-9/+9
\| * \| \|	Document ActionMailer::MailHelper	Zachary Scott	2013-05-15	1	-0/+3
\| * \| \|	Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::Class...	Zachary Scott	2013-05-15	2	-0/+6
\| * \| \|	ActionMailer::Collector should be nodoc'd	Zachary Scott	2013-05-15	1	-1/+1
\| * \| \|	Use new hash syntax	Mikhail Dieterle	2013-05-14	1	-2/+2
\| * \| \|	improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip]	Anton Kalyaev	2013-05-14	1	-3/+4