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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #3809 from lest/test-helpers-in-erb	José Valim	2011-11-30	1	-0/+2
\|\
\| *	fix warning in tests when using render_erb helper	lest	2011-11-30	1	-0/+2
* \|	Merge pull request #3806 from lest/test-helpers-in-erb	José Valim	2011-11-30	6	-17/+31
\|\\|
\| *	test helpers in erb using erb	lest	2011-11-30	6	-17/+31
\|/
*	Merge pull request #1915 from bogdan/active_record_map	Jon Leighton	2011-11-30	6	-2/+62
\|\
\| *	ActiveRecord::Relation#pluck method	Bogdan Gusiev	2011-11-30	6	-2/+62
* \|	Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...	José Valim	2011-11-30	7	-8/+50
* \|	Update sprockets which theoretically fixes the regression we have seen.	José Valim	2011-11-30	1	-1/+1
* \|	Fixes for using action view template in isolation.	José Valim	2011-11-30	3	-2/+12
\|/
*	Module#synchronize is deprecated with no replacement. Please use `monitor` f...	Aaron Patterson	2011-11-29	3	-89/+5
*	push synchronization in to each method. Reduces method calls and makes	Aaron Patterson	2011-11-29	1	-25/+29
*	Automatic closure of connections in threads is deprecated. For example	Aaron Patterson	2011-11-29	4	-27/+31
*	AbstractAdapter#close can be called to add the connection back to the	Aaron Patterson	2011-11-29	3	-11/+35
*	Start implementing @reserved_connections in terms of connection leases.	Aaron Patterson	2011-11-29	1	-3/+3
*	Rename `checked_out` to more descriptive `active_connections`	Aaron Patterson	2011-11-29	1	-3/+3
*	Use connection lease to determine "checked_out" connections	Aaron Patterson	2011-11-29	1	-17/+21
*	expire will set in_use to false	Aaron Patterson	2011-11-29	2	-0/+12
*	last_use is set on connection lease	Aaron Patterson	2011-11-29	1	-0/+6
*	Leased connections return false on second lease	Aaron Patterson	2011-11-29	2	-4/+15
*	Adapters keep in_use flag when leased	Aaron Patterson	2011-11-29	2	-1/+30
*	namespace the adapter test	Aaron Patterson	2011-11-29	1	-121/+123
*	Fix ruby 1.8 compat. const_defined? only takes a second arg on 1.9.	Jon Leighton	2011-11-29	1	-3/+4
*	Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`	Jon Leighton	2011-11-29	6	-66/+60
*	Deprecate set_locking_column in favour of self.locking_column=	Jon Leighton	2011-11-29	4	-10/+56
*	Deprecate set_primary_key in favour of self.primary_key=	Jon Leighton	2011-11-29	18	-43/+71
*	Make sure the original_foo accessor still works (but deprecated) if we are us...	Jon Leighton	2011-11-29	2	-13/+86
*	extract method	Jon Leighton	2011-11-29	1	-49/+25
*	Deprecate set_sequence_name in favour of self.sequence_name=	Jon Leighton	2011-11-29	5	-16/+38
*	Add tests for set_sequence_name etc	Jon Leighton	2011-11-29	2	-1/+23
*	Deprecate set_inheritance_column in favour of self.inheritance_column=	Jon Leighton	2011-11-29	5	-24/+48
*	Deprecate set_table_name in favour of self.table_name= or defining your own m...	Jon Leighton	2011-11-29	21	-72/+138
*	respond_to? information of AR is not the responsibility of the spec	Aaron Patterson	2011-11-29	2	-8/+10
*	Merge pull request #3636 from joshsusser/master	Jon Leighton	2011-11-29	14	-23/+112
\|\
\| *	don't change class definition in test case	Josh Susser	2011-11-29	2	-6/+4
\| *	avoid warnings	Josh Susser	2011-11-27	6	-15/+15
\| *	changelog & docs for GeneratedFeatureMethods	Josh Susser	2011-11-27	2	-0/+26
\| *	use GeneratedFeatureMethods module for associations	Josh Susser	2011-11-27	7	-15/+57
\| *	add test for super-ing to association methods	Josh Susser	2011-11-15	1	-2/+12
\| *	association methods are now generated in modules	Josh Susser	2011-11-15	9	-30/+43
* \|	Fix resolver_test.rb on travis (postgresql isn't setup, so it can't load the ...	Jon Leighton	2011-11-29	1	-6/+6
* \|	Fix schema_cache_test.rb for sqlite3_mem	Jon Leighton	2011-11-29	1	-6/+0
* \|	Merge pull request #3797 from HeeL/test	Vijay Dev	2011-11-29	1	-1/+8
\|\ \
\| * \|	splited a long line to shorter ones	Sergey Parizhskiy	2011-11-29	1	-1/+8
\|/ /
* \|	Merge pull request #3790 from masterkain/patch-1	Vijay Dev	2011-11-29	1	-1/+1
\|\ \
\| * \|	Fix typo in AS::TaggedLogging	Claudio Poli	2011-11-29	1	-1/+1
* \| \|	Merge pull request #3793 from marcandre/asset_host	José Valim	2011-11-28	2	-2/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Handle correctly optional parameters for callable asset_host.	Marc-Andre Lafortune	2011-11-29	2	-2/+10
\|/ /
* \|	remove unused instance variable	Aaron Patterson	2011-11-28	1	-1/+0
* \|	just check in all connections	Aaron Patterson	2011-11-28	1	-6/+2
* \|	remove useless class_eval	Aaron Patterson	2011-11-28	1	-2/+0