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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #5437 from kennyj/fix_5430	Aaron Patterson	2012-03-15	1	-1/+1
*	ConnectionPool.checkout takes account of ruby using 'non-blocking condition v...	Jonathan Rochkind	2012-03-13	1	-9/+18
*	[3-2-stable] Fix GH #5399. connection_pools's keys are ActiveRecord::Base::Co...	kennyj	2012-03-14	1	-1/+1
*	fix activerecord query_method regression with offset into Fixnum	Denis Jean	2012-03-13	1	-1/+1
*	make sure connections returned after close are marked as in_use	Aaron Patterson	2012-03-12	1	-0/+16
*	Merge pull request #5391 from jrochkind/connection_pool_doc	Aaron Patterson	2012-03-12	1	-3/+1
\|\
\| *	inline docs for clear_active_connections! no longer says it cleans dead threa...	Jonathan Rochkind	2012-03-12	1	-3/+1
* \|	Add documentation for find_or_create_by_{attribute}! method.	Andrew White	2012-03-12	1	-0/+3
\|/
*	Add dynamic find_or_create_by_{attribute}! method.	Andrew White	2012-03-12	2	-1/+13
*	Not need to pass join attributes to association build	Rafael Mendonça França	2012-03-08	2	-4/+10
*	make active_connection? return true only if there is an open connection in us...	Aaron Patterson	2012-03-08	1	-3/+4
*	Fix doc examples for has_and_belongs_to_many association	Braden Schaeffer	2012-03-09	1	-2/+2
*	Merge pull request #5316 from Jacobkg/master	José Valim	2012-03-07	1	-1/+1
*	Fix #5069 - Protect foreign key from mass assignment throught association bui...	Jean Boussier	2012-03-05	1	-1/+2
*	fix associations when using per class databases	Lars Kanis	2012-03-04	3	-8/+5
*	only log an error if there is a logger. fixes #5226	Aaron Patterson	2012-03-02	2	-2/+2
*	revert setting NOT NULL constraints in add_timestamps	Xavier Noria	2012-03-01	1	-2/+2
*	Merge branch '3-2-2' into 3-2-stable	Aaron Patterson	2012-03-01	1	-1/+1
\|\
\| *	bumping to 3.2.2	Aaron Patterson	2012-03-01	1	-1/+1
\| *	Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare	Aaron Patterson	2012-02-23	1	-1/+1
\| *	updating RAILS_VERSION	Aaron Patterson	2012-02-22	1	-2/+2
* \|	Fix type_to_sql with text and limit on mysql/mysql2. Fix GH #3931.	kennyj	2012-02-29	1	-9/+20
* \|	Revert "No need to pass options which is never used"	Rafael Mendonça França	2012-02-26	1	-2/+2
* \|	Fixed typo in composed_of example with Money#<=>, was comparing amount itself...	Noah Hendrix	2012-02-25	1	-1/+1
* \|	Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare	Aaron Patterson	2012-02-23	1	-1/+1
\|/
*	prepared statements can be disabled	Aaron Patterson	2012-02-21	8	-30/+56
*	tag bind params with a bind param object	Aaron Patterson	2012-02-21	3	-3/+3
*	more ruby 2.0 respond_to? changes	Aaron Patterson	2012-02-21	1	-1/+1
*	Merge pull request #5096 from lawso017/master	Aaron Patterson	2012-02-21	1	-16/+36
*	Fix some warnings on 3-2-stable	kennyj	2012-02-21	1	-1/+1
*	Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo	José Valim	2012-02-14	1	-1/+4
*	Handle nil in add_index :length option in MySQL	Paul Sadauskas	2012-02-08	1	-1/+1
*	Fix attribute_before_type_cast for serialized attributes. Fixes #4837.	Jon Leighton	2012-02-07	2	-0/+10
*	no need to check for this constant	Xavier Noria	2012-02-07	1	-1/+1
*	Fixed the documenation for 'to_xml'	Markus Fenske	2012-02-07	1	-1/+2
*	let automatic EXPLAIN ignore CACHE notifications	Xavier Noria	2012-02-03	1	-1/+4
*	Fix Issue #4819	densya203	2012-02-04	1	-1/+1
*	Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption	Aaron Patterson	2012-02-02	1	-16/+1
*	Merge pull request #4543 from jdelStrother/find_or_init	Jon Leighton	2012-02-01	1	-2/+1
*	Improve deprecation message	Jon Leighton	2012-01-31	1	-7/+17
*	Merge pull request #4783 from gregolsen/ids_reader_fix	Jon Leighton	2012-01-31	1	-1/+1
*	Allow writing unknown attributes, but with a deprecation warning. Closes #4583.	Jon Leighton	2012-01-31	1	-4/+7
*	Add workaround and deprecation if the inherited hook is not executed. Closes ...	Jon Leighton	2012-01-31	1	-0/+12
*	Merge pull request #4763 from kennyj/fix_4754	Jon Leighton	2012-01-31	1	-1/+1
*	query cache instrumentation should included the bindings in the payload [clos...	Xavier Noria	2012-01-30	1	-1/+1
*	Merge pull request #4715 from pwim/find-create-multi-args	Jon Leighton	2012-01-27	1	-1/+1
*	updating RAILS_VERSION	Xavier Noria	2012-01-26	1	-1/+1
*	disable automatic explain if there is no logger [closes #4671]	Xavier Noria	2012-01-26	1	-0/+2
*	call to_s on value passed to table_name=	Sergey Nartimov	2012-01-26	1	-1/+1
*	Fix another race condition.	Jon Leighton	2012-01-20	2	-6/+10