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

	Commit message (Expand)	Author	Age	Files	Lines
*	Run the logger tests in isolation	Rafael Mendonça França	2012-06-19	2	-1/+3
*	CORES needs to be a integer	Rafael Mendonça França	2012-06-19	1	-1/+1
*	run the notes tests in isolation	Aaron Patterson	2012-06-19	1	-0/+4
*	run railties tests in parallel, default to 2 cores	Aaron Patterson	2012-06-19	2	-2/+39
*	Merge branch 'aderyabin-fix7'	Rafael Mendonça França	2012-06-19	3	-23/+67
\|\
\| *	Remove unneeded code since pluck is respecting joins now	Rafael Mendonça França	2012-06-19	1	-12/+1
\| *	Extract conditional to a method to avoid duplication	Rafael Mendonça França	2012-06-19	2	-15/+22
\| *	handle joins/includes correctly for pluck and calculation.	Andrey Deryabin	2012-06-19	2	-1/+49
* \|	Merge pull request #6787 from frodsan/add_nodoc_asset_helpers	Carlos Antonio da Silva	2012-06-19	3	-4/+4
\|\ \ \| \|/ \|/\|
\| *	add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTag	Francesco Rodriguez	2012-06-19	3	-4/+4
* \|	join any extra args to the tmp path	Aaron Patterson	2012-06-19	1	-0/+1
\|/
*	expand the tmpdir to the realpath so tests on OS X pass	Aaron Patterson	2012-06-19	2	-2/+2
*	Merge branch 'remote'	Aaron Patterson	2012-06-19	2	-33/+22
\|\
\| *	move fanout back to a global variable, add a mutex for safety	Aaron Patterson	2012-06-19	2	-33/+22
* \|	use system tmpdir rather than our own	Aaron Patterson	2012-06-19	3	-13/+26
* \|	make logger a singleton on the class	Aaron Patterson	2012-06-19	1	-3/+7
* \|	listeners are per thread, so remove nested hash	Aaron Patterson	2012-06-19	1	-6/+4
\|/
*	Add missing require	Rafael Mendonça França	2012-06-19	1	-0/+2
*	Merge pull request #6782 from kennyj/db-rake-structure-dump	Rafael Mendonça França	2012-06-19	9	-14/+147
\|\
\| *	Refactor db:structure:dump task.	kennyj	2012-06-20	9	-14/+147
* \|	Merge pull request #6784 from msgehard/active_support_cleanup	Carlos Antonio da Silva	2012-06-19	1	-7/+4
\|\ \
\| * \|	Remove extra test case.	Mike Gehard	2012-06-19	1	-7/+4
\| \|/
* \|	subscribers are per thread, so remove the nested hash access	Aaron Patterson	2012-06-19	1	-5/+3
* \|	documenting concurrency rules for the Fanout class	Aaron Patterson	2012-06-19	1	-0/+3
* \|	remove global cache	Aaron Patterson	2012-06-19	1	-7/+2
* \|	reduce thread locals	Aaron Patterson	2012-06-19	1	-3/+20
* \|	make the fanout notifier local to the current thread	Aaron Patterson	2012-06-19	1	-4/+8
* \|	Merge pull request #6785 from kennyj/rename_testcase_name	Carlos Antonio da Silva	2012-06-19	1	-1/+1
\|\ \
\| * \|	Rename testcase name. It's wrong in the context.	kennyj	2012-06-20	1	-1/+1
\| \|/
* \|	Merge pull request #6783 from kennyj/rename_testname	Rafael Mendonça França	2012-06-19	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Rename MySQLTestPurge to MySQLPurgeTest for consistency.	kennyj	2012-06-20	1	-1/+1
\|/
*	Merge pull request #6779 from simonjefford/db-rake-charset	Carlos Antonio da Silva	2012-06-19	9	-20/+118
\|\
\| *	Refactor db:charset task	Simon Jefford	2012-06-19	9	-20/+118
\|/
*	Merge pull request #6777 from route/logger_in_metal_tests	Carlos Antonio da Silva	2012-06-19	1	-0/+17
\|\
\| *	Added test for case when view doesn't have logger method when using ActionCon...	Dmitry Vorotilin	2012-06-19	1	-0/+17
* \|	Merge pull request #6776 from raggi/cache_control	José Valim	2012-06-18	2	-10/+44
\|\ \ \| \|/ \|/\|
\| *	Ensure that cache-control headers are merged	James Tucker	2012-06-18	2	-10/+44
* \|	Merge branch 'acapilleri-update_nested_attributes'	Rafael Mendonça França	2012-06-19	2	-5/+25
\|\ \
\| * \|	Refactor the conditionals	Rafael Mendonça França	2012-06-19	1	-7/+7
\| * \|	Validates_numericality_of is skipped when changing 0 to to non-empty string	Angelo capilleri	2012-06-19	2	-5/+25
\|/ /
* \|	Merge pull request #5412 from tilsammans/stored_attributes	Carlos Antonio da Silva	2012-06-18	3	-2/+32
\|\ \
\| * \|	Refactor and use class_attribute	Carlos Antonio da Silva	2012-06-18	2	-7/+15
\| * \|	Remember the stored attributes in a config attribute.	Joost Baaij	2012-06-18	3	-1/+23
\|/ /
* \|	Improve the CHANGELOG entry [ci skip]	Rafael Mendonça França	2012-06-18	1	-2/+19
* \|	Merge branch 'hash_with_indifferent_access_fix'	Carlos Antonio da Silva	2012-06-18	2	-1/+9
\|\ \
\| * \|	Use map! instead of replace + map	Carlos Antonio da Silva	2012-06-18	1	-1/+1
\| * \|	Fix lookup on HashWithIndifferentAccess for array values.	Chris Zetter	2012-06-18	2	-1/+9
\|/ /
* \|	Refactor Relation#update a bit to avoid an extra Enumerator instance	Carlos Antonio da Silva	2012-06-18	1	-1/+1
* \|	Make DatabaseTasks a module with real private methods	Carlos Antonio da Silva	2012-06-18	1	-13/+14
* \|	Merge pull request #6775 from takoyakikamen/events	Aaron Patterson	2012-06-18	3	-11/+42
\|\ \ \| \|/ \|/\|