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

	Commit message (Expand)	Author	Age	Files	Lines
*	s/scoped/scope/	Jon Leighton	2012-08-01	1	-1/+1
*	Add CollectionProxy#scope	Jon Leighton	2012-08-01	1	-0/+7
*	Add `Relation#load`	Jon Leighton	2012-08-01	1	-0/+8
*	Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-08-01	5	-44/+85
*	Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."	Jon Leighton	2012-08-01	6	-3/+197
*	AR::Relation#order: make new order prepend old one	Bogdan Gusiev	2012-07-31	4	-13/+13
*	Remove the deprecation of update_column.	Rafael Mendonça França	2012-07-30	1	-38/+17
*	Merge pull request #7196 from rimidl/fix-incorrect-require-mysql-in-mysql_rak...	Aaron Patterson	2012-07-29	1	-1/+5
\|\
\| *	fix incorrect usage `require mysql` in the activerecord/test/.../mysql_rake_t...	Vladimir Strakhov	2012-07-29	1	-1/+5
* \|	More polite cleanup for sqlite tests	Bogdan Gusiev	2012-07-29	1	-4/+4
\|/
*	Revert "Removing composed_of from ActiveRecord."	Rafael Mendonça França	2012-07-27	7	-0/+435
*	Modity the :json_data_empty attribute from `:null => false` to `:null => true`	Yasuo Honda	2012-07-28	1	-1/+1
*	Merge pull request #6827 from zephyr-dev/master	José Valim	2012-07-27	1	-0/+44
\|\
\| *	AR has a subclass of AM:PresenceValidator.	Brent Wheeldon & Nick Monje	2012-07-20	1	-0/+44
* \|	Deprecate Relation#all.	Jon Leighton	2012-07-27	2	-5/+5
* \|	Deprecate ActiveRecord::Base.scoped.	Jon Leighton	2012-07-27	37	-491/+492
* \|	ActiveRecord::Base.all returns a Relation.	Jon Leighton	2012-07-27	28	-305/+313
* \|	Modify the preference attribute from `:null => false` to `:null => true`	Yasuo Honda	2012-07-27	1	-1/+1
* \|	Refactor ActiveRecord::Inheritance.base_class logic	beerlington	2012-07-26	2	-12/+30
* \|	Merge pull request #6654 from stevecj/postgresql-auto-reconnect-2	Aaron Patterson	2012-07-25	2	-0/+74
\|\ \
\| * \|	Stop being silly with formatting of method aliasing.	Steve Jorgensen	2012-07-16	1	-3/+3
\| * \|	Simulated & actual (manual/skipped) PostgreSQL auto-reconnection tests.	Steve Jorgensen	2012-07-16	2	-0/+74
* \| \|	Use string datatype for the setting attribute	Yasuo Honda	2012-07-26	1	-1/+1
* \| \|	Deprecate update_column in favor of update_columns.	Rafael Mendonça França	2012-07-24	12	-43/+64
* \| \|	Use update_columns to implemente the update_column	Rafael Mendonça França	2012-07-24	1	-2/+36
* \| \|	New #update_columns method.	Sebastian Martinez	2012-07-24	1	-0/+57
* \| \|	This pull requests addresses ORA-01400 errors and also supports #6115 issue t...	Yasuo Honda	2012-07-25	1	-1/+1
* \| \|	Restore connection_id on error.	kennyj	2012-07-23	1	-0/+12
* \| \|	rm unnecessary test	Jon Leighton	2012-07-20	3	-12/+0
* \| \|	rm redundant test	Jon Leighton	2012-07-20	2	-9/+0
* \| \|	Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-07-20	6	-197/+3
* \| \|	Convert association macros to the new syntax	Jon Leighton	2012-07-20	15	-134/+135
* \| \|	Merge pull request #7078 from kennyj/logging_query_plan	Rafael Mendonça França	2012-07-19	1	-0/+10
\|\ \ \
\| * \| \|	Log query plan when we use count_by_sql method.	kennyj	2012-07-18	1	-0/+10
* \| \| \|	revert Default timestamps to non-null	Dave Kroondyk	2012-07-18	2	-6/+6
* \| \| \|	Merge pull request #7028 from lexmag/join_table_indexes	José Valim	2012-07-18	1	-3/+17
\|\ \ \ \
\| * \| \| \|	Add join table migration generator	Aleksey Magusev	2012-07-18	1	-3/+17
* \| \| \| \|	AR::Integration must be included after AM::Conversion	John Firebaugh	2012-07-17	1	-0/+6
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #7076 from kennyj/fix_class_eval	Aaron Patterson	2012-07-17	2	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix class_eval without __FILE__ and __LINE__.	kennyj	2012-07-18	2	-3/+3
\| \| \|/ / \| \|/\| \|
* / \| \|	Fixes "Cannot visit ..." with validates_uniqueness_of	beerlington	2012-07-17	1	-0/+16
\|/ / /
* \| \|	Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id method didn'...	kennyj	2012-07-15	1	-0/+14
* \| \|	teaching the mysql adapter how to typecast strings returned from the database	Aaron Patterson	2012-07-13	1	-2/+2
* \| \|	fixing tests to deal with data differences between prepared statements and no...	Aaron Patterson	2012-07-13	3	-3/+8
* \| \|	fix association :extend option	Jon Leighton	2012-07-13	2	-3/+6
* \| \|	stop using class_attribute where methods/inheritance will suffice.	Jon Leighton	2012-07-13	1	-16/+0
* \| \|	Represent association scope options as AR::Relations insternally.	Jon Leighton	2012-07-13	2	-19/+38
* \| \|	fix assertion arguments order	Jon Leighton	2012-07-13	1	-2/+2
* \| \|	Allow associations to take a lambda which builds the scope	Jon Leighton	2012-07-13	4	-23/+32
* \| \|	support relations created with a table alias	Jon Leighton	2012-07-13	1	-0/+10