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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6838 from kennyj/added_registration_task	Carlos Antonio da Silva	2012-07-07	2	-7/+27
\|\
\| *	Added a feature to add a database task. e.g. OracleDatabaseTasks	kennyj	2012-06-24	2	-7/+27
* \|	Use "instance_accessor" for flash types class attribute	Carlos Antonio da Silva	2012-07-07	2	-4/+3
* \|	fixup changelog	Jon Leighton	2012-07-07	1	-1/+1
* \|	Relation#inspect handles doesn't perform a new query on an already-loaded rel...	Jon Leighton	2012-07-07	2	-2/+16
* \|	Simplify Relation#inspect	Jon Leighton	2012-07-07	1	-12/+3
* \|	Merge pull request #6992 from kennyj/improve_6977-2	José Valim	2012-07-07	4	-14/+65
\|\ \
\| * \|	Added support add_flash_types	kennyj	2012-07-07	4	-14/+65
\|/ /
* \|	Merge pull request #6993 from morgoth/engine-table-name-prefix-generator-fix	José Valim	2012-07-07	3	-2/+14
\|\ \
\| * \|	Fixed generating namespaced table_name_prefix in engines	Wojciech Wnętrzak	2012-07-06	2	-2/+2
\| * \|	Added failing test for generating namespaced table_name_prefix in engines	Wojciech Wnętrzak	2012-07-06	1	-0/+12
* \| \|	Merge pull request #6996 from kennyj/remove_unused_code_20120707	José Valim	2012-07-07	1	-4/+0
\|\ \ \
\| * \| \|	Remove unused code.	kennyj	2012-07-07	1	-4/+0
* \| \| \|	Merge pull request #6997 from kennyj/fix_stored_attributes	José Valim	2012-07-07	4	-2/+16
\|\ \ \ \
\| * \| \| \|	Added instance_writer: false for stored/serialized attributes.	kennyj	2012-07-07	4	-2/+16
\| \|/ / /
* \| \| \|	Update master	José Valim	2012-07-07	1	-0/+2
* \| \| \|	Merge pull request #6987 from dmathieu/limit_inspect	José Valim	2012-07-07	3	-3/+22
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Limit the number of records in Relation#inspect	Damien Mathieu	2012-07-06	3	-3/+22
\| \|/ /
* \| \|	Fix failing AM test due to missing template	Carlos Antonio da Silva	2012-07-06	1	-1/+1
* \| \|	Improve docs, changelog and release notes for Action Mailer default_options=	Carlos Antonio da Silva	2012-07-06	4	-6/+14
* \| \|	Merge pull request #6950 from paneq/default_from2	Carlos Antonio da Silva	2012-07-06	4	-3/+21
\|\ \ \
\| * \| \|	Introduce config.action_mailer.default_from=	Robert Pankowecki	2012-07-03	4	-3/+21
* \| \| \|	Merge pull request #6995 from frodsan/update_test_help	Carlos Antonio da Silva	2012-07-06	1	-1/+4
\|\ \ \ \
\| * \| \| \|	update test_help to config properly turn natural language option	Francesco Rodriguez	2012-07-06	1	-1/+4
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #6990 from mirceapricop/bug/mime-type-method-name	José Valim	2012-07-06	4	-2/+33
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Prevent conflict between mime types and Object methods	Mircea Pricop	2012-07-06	4	-2/+33
* \| \| \|	Merge pull request #6985 from sidonath/disable-query-cache-for-locks	Rafael Mendonça França	2012-07-06	2	-1/+17
\|\ \ \ \
\| * \| \| \|	Disable query cache for lock queries	Damir Zekic	2012-07-06	2	-1/+17
* \| \| \| \|	Update release notes with AR::Relation#inspect change [ci skip]	Carlos Antonio da Silva	2012-07-06	2	-6/+9
* \| \| \| \|	Remove mention to csv fixtures from test_helper in guides [ci skip]	Carlos Antonio da Silva	2012-07-06	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Show the records in Relation#inspect	Jon Leighton	2012-07-06	3	-6/+17
\|/ / /
* \| \|	Merge pull request #6927 from parndt/patch-3	Carlos Antonio da Silva	2012-07-05	2	-3/+3
\|\ \ \
\| * \| \|	Made ArgumentError messages consistent.	Philip Arndt	2012-07-06	2	-3/+3
* \| \| \|	Revert "push parameter instantiation to one method"	Aaron Patterson	2012-07-05	1	-1/+1
* \| \| \|	Merge branch 'master' into testclean	Aaron Patterson	2012-07-05	9	-6/+81
\|\ \ \ \
\| * \ \ \	Merge pull request #6976 from vitorbal/master	Carlos Antonio da Silva	2012-07-05	1	-1/+3
\| \|\ \ \ \
\| \| * \| \| \|	Add documentation for inheritance_column method	Vitor Balocco	2012-07-05	1	-1/+3
\| \|/ / / /
\| * \| \| \|	Merge pull request #6957 from francois2metz/options_method	Carlos Antonio da Silva	2012-07-05	2	-2/+12
\| \|\ \ \ \
\| \| * \| \| \|	Add the options method to action_controller testcase.	François de Metz	2012-07-04	2	-2/+12
\| * \| \| \| \|	Merge pull request #6959 from robin850/patch-1	José Valim	2012-07-05	1	-0/+49
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add few information on the field types	Robin Dupret	2012-07-04	1	-0/+49
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #6967 from frodsan/quite_as_duration	Rafael Mendonça França	2012-07-05	3	-1/+15
\| \|\ \ \ \ \
\| \| * \| \| \| \|	fix quoting for ActiveSupport::Duration instances	Francesco Rodriguez	2012-07-04	3	-1/+15
\| * \| \| \| \| \|	Merge pull request #6969 from mkdynamic/patch-1	Jeremy Kemper	2012-07-04	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Use ArgumentError vs. RuntimeError, which is more precise.	Mark Dodwell	2012-07-04	1	-1/+1
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #6968 from guilleiguaran/update-test-helper	Rafael Mendonça França	2012-07-04	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	CSV fixtures aren't supported by default anymore, update generated test_helpe...	Guillermo Iguaran	2012-07-04	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'master' into testclean	Aaron Patterson	2012-07-04	5	-13/+19
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	activesupport gem dependencies should reflect the versions we actually use	Aaron Patterson	2012-07-04	3	-1/+2
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #6961 from frodsan/fix_release_note	Santiago Pastorino	2012-07-04	1	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|