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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make the erubis implementation easier for plugins to change.	Michael Koziarski	2009-10-15	1	-1/+4
\|
*	Add a read-only method which plugin authors can use to determine if xss ↵	Michael Koziarski	2009-10-15	1	-0/+5
\| \| \| \| \| \| \|	escaping. This doesn't provide a way to turn off the escaping, but alternative template engine authors can figure out what their default should be by calling this. Avoids a messy version + plugin check.
*	Don't push siblings on load path if using bundled env	Jeremy Kemper	2009-10-14	2	-7/+16
\|
*	AV expects options[:locals] to be a Hash	Jeremy Kemper	2009-10-14	1	-0/+1
\|
*	CI bundles Active Record dependencies before running (pulls in Arel)	Jeremy Kemper	2009-10-14	1	-3/+3
\|
*	Merge branch 'arel'	Jeremy Kemper	2009-10-14	36	-683/+822
\|\
\| *	Clarify AR dependency	Jeremy Kemper	2009-10-14	1	-6/+10
\| \|
\| *	Fix env path	Jeremy Kemper	2009-10-14	1	-1/+1
\| \|
\| *	Include bundled env in toplevel require, if present	Jeremy Kemper	2009-10-14	2	-11/+10
\| \|
\| *	No more toplevel arel sibling	Jeremy Kemper	2009-10-14	1	-4/+2
\| \|
\| *	Merge branch 'master' into arel	Jeremy Kemper	2009-10-14	39	-246/+933
\| \|\
\| * \|	Move from git submodule to gem bundle	Jeremy Kemper	2009-10-14	5	-9/+14
\| \| \|
\| * \|	Merge commit 'rails/master'	Emilio Tagua	2009-10-14	5	-31/+15
\| \|\ \
\| * \| \|	Use ActiveSupport::Callbacks instead of	Emilio Tagua	2009-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport::DeprecatedCallbacks.
\| * \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-10-13	62	-4019/+2595
\| \|\ \ \
\| * \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-10-08	45	-58/+450
\| \|\ \ \ \
\| * \| \| \| \|	Updated ARel commit version.	Emilio Tagua	2009-10-08	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Relations: Added offset when finding with associations. Delegate array instance	Emilio Tagua	2009-10-07	2	-10/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	methods to to_a.
\| * \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-10-07	7	-111/+134
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Don't send table_name when updating attributes, use the class arel_table.	Emilio Tagua	2009-10-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't send table_name when there's no need to.	Emilio Tagua	2009-10-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow preload and eager_load to work on relations at the same time.	Emilio Tagua	2009-10-07	2	-6/+30
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-10-06	8	-1/+79
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-10-05	15	-809/+64
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Initial documentation to Base#all.	Emilio Tagua	2009-10-05	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'associations_2'	Emilio Tagua	2009-10-05	6	-13/+90
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Added eager loading support to Relation and ActiveRecord#all.	Emilio Tagua	2009-10-05	4	-21/+34
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moved relation's test to relation_test.	Emilio Tagua	2009-10-05	4	-9/+19
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Added association preload to relation.	Emilio Tagua	2009-09-01	3	-4/+58
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-10-05	50	-395/+396
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-10-03	3	-25/+125
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-10-02	414	-1485/+1675
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-09-22	22	-301/+652
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-09-21	76	-708/+498
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated ARel version.	Emilio Tagua	2009-09-14	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-09-14	250	-673/+1223
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-09-08	34	-558/+490
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-09-08	101	-1239/+2115
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations.rb
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge commit 'rails/master'	Emilio Tagua	2009-09-01	164	-6353/+1140
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/associations.rb
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Add readonly support for relations.""	Emilio Tagua	2009-08-27	3	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f2c0725d79e29b02e30e7a4827851acc4a766730.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Add readonly support for relations."	Emilio Tagua	2009-08-27	3	-23/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7cce95b25ace33e04526d4490e487a080c1f9b96.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readonly support for relations.	Emilio Tagua	2009-08-27	3	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No need to reload the relation table with a method param, just nil it.	Emilio Tagua	2009-08-27	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance: Don't reload ARel relation on update.	Emilio Tagua	2009-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance: Don't reload the ARel relation on create, do it on	Emilio Tagua	2009-08-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reset_column_information.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance: Don't reload the arel_table when destroying.	Emilio Tagua	2009-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-08-27	46	-274/+593
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove useless var local definition.	Emilio Tagua	2009-08-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No need to create a new relation if the argument is blank.	Emilio Tagua	2009-08-25	2	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'rails/master'	Emilio Tagua	2009-08-25	9	-90/+164
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \