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

	Commit message (Expand)	Author	Age	Files	Lines
*	use association_primary_key in AssociationScope#add_constraints	Marian Rudzynski	2011-05-26	1	-1/+1
*	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-05-25	8	-127/+4
\|\
\| *	Merge pull request #1285 from joshk/remove_active_record_deprecations	Aaron Patterson	2011-05-25	8	-127/+4
\| \|\
\| \| *	removed deprecated methods, and related tests, from ActiveRecord	Josh Kalderimis	2011-05-25	8	-127/+4
* \| \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	28	-82/+86
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove extra white spaces on ActiveRecord docs.	Sebastian Martinez	2011-05-23	25	-51/+51
\| * \|	has_many :dependent => :restrict raises an exception but is not documented ap...	Aditya Sanghi	2011-05-22	1	-2/+4
\| * \|	Add more doc to #update_column.	Sebastian Martinez	2011-05-20	1	-0/+2
\| * \|	Changing examples: use 'each' instead of 'for in'	Guillermo Iguaran	2011-05-19	1	-4/+4
\| * \|	Remove extra white-spaces.	Sebastian Martinez	2011-05-19	1	-24/+24
\| * \|	Closes GH #1032	John Paul Ashenfelter	2011-05-19	1	-1/+1
* \| \|	Fix the AR::Base#inspect method [closes #1294]	Franck Verrot	2011-05-25	1	-6/+10
* \| \|	Database.rake file fixed for load_generators	Arun Agrawal	2011-05-25	1	-2/+1
\| \|/ \|/\|
* \|	Everyone receives app as argument for consistency.	José Valim	2011-05-25	1	-2/+2
* \|	Fix infinite recursion where a lazy default scope references a scope. Fixes #...	Jon Leighton	2011-05-25	2	-4/+13
* \|	Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope	Jon Leighton	2011-05-24	1	-1/+1
\|\ \
\| * \|	Ignore :includes on through associations	Andrew White	2011-05-24	1	-1/+1
* \| \|	Ensure that the surrounding code in Relation#to_a respects the default_scope ...	Jon Leighton	2011-05-24	1	-17/+24
* \| \|	rescue record invalid exceptions and return false from the save method. fixes...	Aaron Patterson	2011-05-24	1	-1/+5
* \| \|	properly reference yml alias nodes	dmathieu	2011-05-24	2	-3/+3
\|/ /
* \|	Remove extra white-space on some exception messages.	Sebastian Martinez	2011-05-23	6	-7/+7
* \|	fixing 1.8 support for new fixture tests	Aaron Patterson	2011-05-23	1	-1/+4
* \|	removing CSV fixture support	Aaron Patterson	2011-05-23	1	-52/+10
* \|	fixture file will validate fixture format	Aaron Patterson	2011-05-23	1	-1/+8
* \|	return an empty array for empty yaml files	Aaron Patterson	2011-05-23	1	-1/+3
* \|	use top level file constant for join, etc	Aaron Patterson	2011-05-23	1	-4/+4
* \|	adding AR::Fixtures::File class to wrap a fixture file	Aaron Patterson	2011-05-23	2	-0/+44
* \|	Removed AS core_ext/kernel/requires as it's not used and is bad practice.	Josh Kalderimis	2011-05-23	3	-3/+0
* \|	Merge pull request #1228 from fcheung/db_time_fix2	José Valim	2011-05-23	1	-1/+3
\|\ \
\| * \|	Take into account time spent in AR even if a redirect occurs or if it is afte...	Frederick Cheung	2011-05-23	1	-1/+3
* \| \|	Merge pull request #1184 from gnufied/master	Aaron Patterson	2011-05-23	1	-0/+1
\|\ \ \
\| * \| \|	fix connection not established error while running rake task	Bhavin Kamani	2011-05-21	1	-0/+1
* \| \| \|	Revert "Take into account time spent in AR even if a redirect occurs or if it...	David Heinemeier Hansson	2011-05-22	1	-5/+3
* \| \| \|	Fix problem with loading polymorphic associations which have been defined in ...	Jon Leighton	2011-05-22	3	-13/+26
* \| \| \|	Take into account time spent in AR even if a redirect occurs or if it is afte...	Frederick Cheung	2011-05-22	1	-3/+5
\| \|/ / \|/\| \|
* \| \|	Bump versions for rc1	David Heinemeier Hansson	2011-05-21	1	-1/+1
* \| \|	Merge pull request #1180 from Karunakar/documentation_change	Xavier Noria	2011-05-21	2	-4/+14
\|\ \ \
\| * \| \|	ActionMailer deliver method Documentation corrected Ticket #761	Ganesh Kumar	2011-05-21	1	-1/+1
\| * \| \|	Documentation Error Fixed for ticket #839	Karunakar (Ruby)	2011-05-21	1	-3/+13
\| \|/ /
* \| \|	Merge pull request #1187 from thedarkone/polymorphic-class-fix	Santiago Pastorino	2011-05-21	1	-1/+1
\|\ \ \
\| * \| \|	Handle polymorphic_type NOT NULL-able columns as well.	thedarkone	2011-05-21	1	-1/+1
* \| \| \|	Add support for passing mass assignment roles to dynamic finders. Closes #1170.	Andrew White	2011-05-21	1	-2/+2
\|/ / /
* \| \|	Merge pull request #1162 from guilleiguaran/singularize_individual_table_name	Jon Leighton	2011-05-21	3	-5/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	AliasTracker.pluralize use pluralize_table_names of model	Guillermo Iguaran	2011-05-20	2	-3/+3
\| * \|	Allow pluralize_table_names for individual model	Guillermo Iguaran	2011-05-20	1	-2/+2
* \| \|	Merge pull request #1157 from smartinez87/extra_whitespaces	Xavier Noria	2011-05-20	1	-3/+3
\|\ \ \
\| * \| \|	Remove extra white spaces.	Sebastian Martinez	2011-05-19	1	-3/+3
\| \|/ /
* / /	Syntax cleanup: for in => each	Guillermo Iguaran	2011-05-19	3	-3/+3
\|/ /
* \|	Implement proxy_owner, proxy_target and proxy_reflection methods on Collectio...	Jon Leighton	2011-05-19	2	-5/+30
* \|	Merge pull request #1097 from kirillrdy/master	Michael Koziarski	2011-05-19	1	-1/+1
\|\ \ \| \|/ \|/\|