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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	save the where values in variables so we don't need to look them up all	Aaron Patterson	2013-05-20	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the time
* \| \| \| \|	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 [ci skip]
\| * \| \| \| \|	Spelling correction in Upgrading Guide	Zack Hubert	2013-05-20	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	Fixes spelling of 'erratta' to 'errata'
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge pull request #10646 from kennyj/fix_am_20130517	Rafael Mendonça França	2013-05-20	2	-2/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix ActionMailer testcase break with mail 2.5.4.
\| * \| \| \| \|	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
\| * \| \| \| \| \|	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
\| * \| \| \| \| \|	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
\| * \| \| \| \| \|	Missing ending ``` at 14.2 Merging of scopes	Leo Gallucci	2013-05-19	1	-0/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \|	http://edgeguides.rubyonrails.org/active_record_querying.html#merging-of-scopes
* \| \| \| \| \|	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
\| * \| \| \| \| \|	"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 ↵	Vijay Dev	2013-05-19	1	-14/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in inflectors" This reverts commit 8f901dee9e2072dd20e0a252a89dd501d783d85b.
\| * \| \| \| \| \|	Revert "Changed the CHANGELOG for active_support and improved the doc for ↵	Vijay Dev	2013-05-19	2	-9/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inflector method classify" This reverts commit 8d5fcb691e7496900f1c77dff8d6e729c1b56201. Reason: Changelogs are not to be edited in docrails. [ci skip]
\| * \| \| \| \| \|	Revert "ActionMailer::Collector should be nodoc'd"	Vijay Dev	2013-05-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip]
\| * \| \| \| \| \|	Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"	Vijay Dev	2013-05-19	9	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip]
\| * \| \| \| \| \|	Revert "Document Rails::Generators::MailerGenerator"	Vijay Dev	2013-05-19	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. Reason: Let's not nodoc without reason. [ci skip]
\| * \| \| \| \| \|	Changed the CHANGELOG for active_support and improved the doc for inflector ↵	aditya-kapoor	2013-05-19	2	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	method classify
\| * \| \| \| \| \|	Fix documentation for ActionMailer template names.	Megan Bowra-Dean	2013-05-17	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionMailer templates that are not plain text do not require .text. in the name and will fail to be picked up automatically if it is included in the name.
\| * \| \| \| \| \|	Merge pull request #137 from zduci/master	Radu Busuioc	2013-05-16	1	-7/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected documentation regarding validation errors
\| \| * \| \| \| \| \|	Corrected documentation regarding validation errors	Radu Busuioc	2013-05-16	1	-7/+7
\| \|/ / / / / /
\| * \| \| \| \| \|	Corrected documentation and added some more for the classify method in ↵	aditya-kapoor	2013-05-16	1	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inflectors
\| * \| \| \| \| \|	Added some more documentation for define_readers and define_writer of the ↵	aditya-kapoor	2013-05-15	3	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Association and its inherited classes
\| * \| \| \| \| \|	Added some more documentation for ↵	aditya-kapoor	2013-05-15	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveRecord::Associations::Builder::Association class
\| * \| \| \| \| \|	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 ↵	Zachary Scott	2013-05-15	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionMailer::DeliveryMethods::ClassMethods
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleaned up rdoc a bit emphasizing that callbacks are called. Also removed the stress on the fact that records are always removed. If callbacks return false then records will not be deleted.
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed some typos
\| * \| \| \| \| \| \|	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. [ci skip]
\| * \| \| \| \| \| \|	Adding notes on PATCH to the upgrade guide.	Steve Klabnik	2013-05-13	1	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discusses compatibility between PATCH and PUT, as well as how to add support for JSON PATCH to your application. Fixes #10439.
* \| \| \| \| \| \| \|	Merge pull request #10676 from tkhr/add-test-to-counter_cache_test.rb	Rafael Mendonça França	2013-05-18	5	-4/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test to counter cache test.rb
\| * \| \| \| \| \| \| \|	Fix tests which started to fail due to commit ↵	Takehiro Adachi	2013-05-18	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	0123c39f41e2062311b2197e6e230ef8ad67e20e Due to commit 0123c39f41e2062311b2197e6e230ef8ad67e20e, column topic.unique_replies_count has been added, and these test started to fail since the tests depends on the topic tables column info.
\| * \| \| \| \| \| \| \|	Add test to AR's counter_cache_test.rb	Takehiro Adachi	2013-05-18	3	-0/+14
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1 4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass more then one association to the `reset_counters` method.