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

	Commit message (Expand)	Author	Age	Files	Lines
*	Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2	Jon Leighton	2012-03-30	1	-20/+10
*	remove irrelevant references to ARel	Jon Leighton	2012-03-30	1	-2/+2
*	Add Relation#find_by and Relation#find_by!	Jon Leighton	2012-03-30	6	-0/+114
*	Merge pull request #2945 from Casecommons/nested_attributes_module	Jon Leighton	2012-03-30	3	-1/+15
\|\
\| *	Nested attribute setters can be overridden.	Jonathan Mukai & Peter Jaros	2012-03-28	3	-1/+15
* \|	recurse in read_attribute we get caching / don't duplicate code	Jon Leighton	2012-03-30	1	-3/+2
* \|	Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast	Aaron Patterson	2012-03-29	3	-5/+8
\|\ \
\| * \|	Deprecate Column#type_cast_code	Carlos Antonio da Silva	2012-03-29	2	-4/+4
\| * \|	Properly typecast id attribute when using custom primary key	Carlos Antonio da Silva	2012-03-29	1	-1/+4
\|/ /
* \|	Merge pull request #5345 from guilleiguaran/ar-slice	Jeremy Kemper	2012-03-29	3	-0/+23
\|\ \
\| * \|	CHANGELOG entry for AR#slice	Guillermo Iguaran	2012-03-29	1	-0/+5
\| * \|	Add ActiveRecord::Base#slice to slice method calls	Guillermo Iguaran	2012-03-29	2	-0/+18
\|/ /
* \|	Merge pull request #5617 from Empact/paths	Aaron Patterson	2012-03-29	2	-9/+1
\|\ \
\| * \|	Define Paths::Root#[]= in terms of #add.	Ben Woosley	2012-03-29	1	-2/+1
\| * \|	Drop Paths::Root initializer check of #path as it isn't checked in the #path=...	Ben Woosley	2012-03-29	2	-5/+0
\| * \|	Drop unnecessary require in Rails::Paths	Ben Woosley	2012-03-29	1	-2/+0
\|/ /
* \|	Merge pull request #5625 from nertzy/prefix_partial_path_with_controller_name...	José Valim	2012-03-28	7	-15/+88
\|\ \
\| * \|	Make controller namespace partial prefix optional	Grant Hutchins	2012-03-28	7	-11/+84
\| * \|	Test that render gets correct exact template name	Grant Hutchins	2012-03-28	1	-4/+4
* \| \|	Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helper	José Valim	2012-03-28	1	-1/+2
\|\ \ \
\| * \| \|	Changing active model dirty module helper method to more appropriate method w...	Prasath Venkatraman	2012-02-06	1	-1/+2
* \| \| \|	Merge pull request #5359 from avakhov/missed-commits-from-3-2-stable	Santiago Pastorino	2012-03-28	5	-3/+30
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	clarification to prevent confusing newbies; Passenger/Unicorn are app servers...	Michael de Silva	2012-03-28	1	-1/+1
\| * \| \|	datetime_select should work with -/+ infinity dates	Joe Van Dyk	2012-03-28	2	-1/+13
\| * \| \|	Add a test case for layout nil.	José Valim	2012-03-28	2	-1/+16
* \| \| \|	Merge pull request #4843 from seamusabshere/patch-1	Xavier Noria	2012-03-28	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	thanks to @jurriaan	Seamus Abshere	2012-02-14	1	-1/+1
\| * \| \|	Possibly clearer way of getting rid of ` and "	Seamus Abshere	2012-02-01	1	-1/+1
* \| \| \|	Merge pull request #5643 from rafaelfranca/remove-duplication	Santiago Pastorino	2012-03-28	3	-44/+39
\|\ \ \ \
\| * \| \| \|	Remove code duplication in InclusionValidator and ExclusionValidator.	Rafael Mendonça França	2012-03-28	3	-44/+39
\| \| \|/ / \| \|/\| \|
* / \| \|	Set proper rendered_format when doing render :inline	Santiago Pastorino	2012-03-28	2	-2/+3
\|/ / /
* \| \|	Allow ActiveModel::Name to duck type	Piotr Sarnacki	2012-03-28	1	-4/+4
* \| \|	Cover one more case in auth_token and remote forms	Piotr Sarnacki	2012-03-28	2	-1/+8
* \| \|	config.action_view.embed_authenticity_token_in_remote_forms is true by default	Piotr Sarnacki	2012-03-28	5	-22/+22
* \| \|	Added config.action_view.embed_authenticity_token_in_remote_forms	Piotr Sarnacki	2012-03-28	5	-10/+76
* \| \|	much code can be deleted thanks to @tenderlove's refactoring	Jon Leighton	2012-03-28	3	-72/+6
* \| \|	Merge pull request #5630 from andhapp/fix-config-asset-manifest	Santiago Pastorino	2012-03-28	1	-1/+1
\|\ \ \
\| * \| \|	Changed the config.assets.manifest to nil in the comments in the production c...	Anuj Dutta	2012-03-28	1	-1/+1
* \| \| \|	Add test for default_url_options[:port]	Aaron Suggs	2012-03-28	1	-0/+12
* \| \| \|	Merge pull request #2528 from cesario/fix_2507	José Valim	2012-03-28	3	-5/+15
\|\ \ \ \
\| * \| \| \|	Rails.initialized? can be called at any time without raising an exception [Cl...	Franck Verrot	2012-03-28	3	-5/+15
* \| \| \| \|	Merge pull request #5623 from Houdini/master	José Valim	2012-03-28	1	-2/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	remove redundant variable	Dmitrii Golub	2012-03-28	1	-2/+1
\| \|/ / /
* \| \| \|	Merge pull request #5616 from cbartlett/migration-indent	Santiago Pastorino	2012-03-27	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix indenting in migration generator	Colin Bartlett	2012-03-27	1	-2/+2
* \| \| \| \|	Merge pull request #5621 from rafaelfranca/fix-2492-master	Jeremy Kemper	2012-03-27	2	-3/+37
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Check if the options hash already exists and merge it with the another	Rafael Mendonça França	2012-03-27	3	-18/+23
\| * \| \| \|	Fixing issue #2492 for master branch. ActionView::Base.field_error_proc doesn...	Andrey Samsonov	2012-03-27	2	-2/+31
* \| \| \| \|	Merge pull request #5620 from jcoleman/textarea-newline-fix-breaks-haml-master	Santiago Pastorino	2012-03-27	3	-8/+12
\|\ \ \ \ \
\| * \| \| \| \|	Don't break Haml with textarea newline fix.	James Coleman	2012-03-27	3	-8/+12