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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| * \| \|	Added documentation for model migration generation	aditya-kapoor	2013-05-14	1	-0/+4
\| * \| \|	Added documentation for Rails::Generators::NamedBase.template	aditya-kapoor	2013-05-14	1	-0/+4
\| * \| \|	fix grammar	Adam Konner	2013-05-13	1	-2/+2
\| * \| \|	emphasize that callbacks are called in destroy_all	Neeraj Singh	2013-05-13	2	-7/+7
\| * \| \|	Document ActionMailer::Base#set_content_type	Zachary Scott	2013-05-12	1	-0/+9
* \| \| \|	Merge pull request #10678 from prathamesh-sonpatki/typos	Carlos Antonio da Silva	2013-05-18	3	-3/+3
\|\ \ \ \
\| * \| \| \|	Fxied some typos	Prathamesh Sonpatki	2013-05-18	3	-3/+3
* \| \| \| \|	Merge pull request #10597 from steveklabnik/patch_documentation	Steve Klabnik	2013-05-18	1	-0/+53
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Adding notes on PATCH to the upgrade guide.	Steve Klabnik	2013-05-13	1	-0/+53
* \| \| \| \|	Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rb	Rafael Mendonça França	2013-05-18	5	-4/+18
\|\ \ \ \ \
\| * \| \| \| \|	Fix tests which started to fail due to commit 0123c39f41e2062311b2197e6e230ef...	Takehiro Adachi	2013-05-18	2	-4/+4
\| * \| \| \| \|	Add test to AR's counter_cache_test.rb	Takehiro Adachi	2013-05-18	3	-0/+14
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mocha	Rafael Mendonça França	2013-05-18	1	-1/+5
\|\ \ \ \ \
\| * \| \| \| \|	Don't autorequire mocha to avoid deprecation warnings	Prathamesh Sonpatki	2013-05-18	1	-1/+5
\|/ / / / /
* \| \| \| \|	stop swallowing exceptions in assert_queries. Methods that raise an	Aaron Patterson	2013-05-17	1	-2/+2
* \| \| \| \|	Merge pull request #10672 from carllerche/master	Santiago Pastorino	2013-05-17	2	-0/+29
\|\ \ \ \ \
\| * \| \| \| \|	Bug fix: Evented notification subscribers can handle published events	Carl Lerche	2013-05-17	2	-0/+29
\|/ / / / /