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

	Commit message (Collapse)	Author	Age	Files	Lines
*	It should be README.rdoc fixes #4067	Arun Agrawal	2011-12-20	1	-1/+1
\|
*	Merge pull request #4064 from nashby/date-helper-field-error-proc	José Valim	2011-12-20	4	-12/+35
\|\ \| \| \| \|	fix adding field_with_errors to date selects, closes #3487
\| *	fix adding field_with_errors to date selects, closes #3487	Vasiliy Ermolovich	2011-12-20	3	-11/+11
\| \|
\| *	add failing tests for issue #3487	Vasiliy Ermolovich	2011-12-19	1	-1/+24
\| \|
* \|	Fix reference to old :sql schema_format location	Alex Tambellini	2011-12-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	After 15fb430 the default location of the :sql schema_format location was changed from environment_name.sql to structure.sql. This pull request updates a reference to the old schema format location in the migration guides.
* \|	Improve doc for ActiveRecord::Base.unscoped.	Hendy Tanata	2011-12-20	1	-6/+8
\| \|
* \|	Depend on 3-2-stable.	José Valim	2011-12-20	1	-2/+2
\| \|
* \|	Add a test case for layout nil.	José Valim	2011-12-20	2	-12/+17
\| \|
* \|	remove warnings about @variable_for_layout	lest	2011-12-20	1	-5/+6
\| \| \| \| \| \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
* \|	Check if source is encoding aware.	José Valim	2011-12-20	1	-32/+30
\| \|
* \|	Do not hard code encoding to UTF8	José Valim	2011-12-20	2	-48/+54
\| \|
* \|	don't encode an UTF-8 encoded template	Xu Pan	2011-12-20	2	-2/+3
\| \| \| \| \| \| \| \|	Signed-off-by: José Valim <jose.valim@gmail.com>
* \|	Remove i18n dependencies from AP and AMo since they are in AS.	José Valim	2011-12-20	2	-2/+0
\| \|
* \|	Party like its R-C-UNO!	David Heinemeier Hansson	2011-12-19	9	-9/+9
\| \|
* \|	Add an invitation to use jbuilder, since we are not going to bundle it in 3.2	David Heinemeier Hansson	2011-12-19	1	-0/+3
\| \|
* \|	Merge pull request #4036 from Juanmcuello/database_tasks	Piotr Sarnacki	2011-12-19	1	-9/+22
\|\ \ \| \| \| \| \| \|	Fix database tasks in test namespace.
\| * \|	Fix database tasks in test namespace.	Juan M. Cuello	2011-12-19	1	-9/+22
\| \|/ \| \| \| \| \| \| \| \|	This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff that was reverted due to test failures, but now with a correction.
* /	adding tests for #4029	Aaron Patterson	2011-12-19	2	-1/+52
\|/
*	Revert "Merge pull request #4030 from Juanmcuello/database_tasks"	José Valim	2011-12-19	1	-20/+9
\| \| \| \| \|	This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad.
*	Merge pull request #4030 from Juanmcuello/database_tasks	José Valim	2011-12-19	1	-9/+20
\|\ \| \| \| \|	Fix database tasks in test namespace.
\| *	Fix database tasks in test namespace.	Juan M. Cuello	2011-12-19	1	-9/+20
\|/
*	Don't notify campfire when the build keeps passing	Jon Leighton	2011-12-18	1	-1/+4
\|
*	fix a minor typo	Vijay Dev	2011-12-19	1	-1/+1
\|
*	Update activerecord/lib/active_record/railties/databases.rake	José Valim	2011-12-18	1	-1/+1
\|
*	Merge pull request #4019 from kommen/rake_db_structure	José Valim	2011-12-18	2	-13/+23
\|\ \| \| \| \|	Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
\| *	Rename STRUCTURE to DB_STRUCTURE, update dump task description and add ↵	Dieter Komendera	2011-12-18	2	-3/+11
\| \| \| \| \| \| \| \|	simple testcase.
\| *	Make structure file configureable in db:structure:dump analog to SCHEMA in ↵	Dieter Komendera	2011-12-16	1	-12/+14
\| \| \| \| \| \| \| \|	db:schema dump and clean up a bit.
* \|	Merge pull request #4014 from lest/bypass-preloading-for-ids-reader	Jon Leighton	2011-12-18	2	-2/+16
\|\ \ \| \| \| \| \| \|	bypass preloading for ids_reader
\| * \|	bypass preloading for ids_reader	Sergey Nartimov	2011-12-18	2	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when fetching ids for a collection, bypass preloading to avoid the unnecessary performance overhead
* \| \|	Merge pull request #4011 from lest/scope-with-lambda-duplicates	Jon Leighton	2011-12-18	3	-1/+8
\|\ \ \ \| \| \| \| \| \| \| \|	call scope within unscoped to prevent duplication of where values
\| * \| \|	call scope within unscoped to prevent duplication of where values	Sergey Nartimov	2011-12-17	3	-1/+8
\| \| \| \|
* \| \| \|	Merge pull request #4018 from arunagw/warning_removed_	José Valim	2011-12-18	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Warning removed in test
\| * \| \| \|	Warning removed in test	Arun Agrawal	2011-12-18	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #4017 from arunagw/remove_extra_require	José Valim	2011-12-17	2	-2/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	No need 'abstract_unit' here. It's already in 'generators_test_helper'
\| * \| \| \|	No need 'abstract_unit' here. It's already in 'generators_test_helper'	Arun Agrawal	2011-12-18	2	-2/+0
\|/ / / /
* \| \| \|	Merge pull request #4009 from kirs/generate-rake-task	Piotr Sarnacki	2011-12-17	4	-0/+41
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Rake tasks generator
\| * \| \| \|	Rake tasks generator with test	Kir	2011-12-17	4	-0/+41
\| \| \| \| \|
* \| \| \| \|	Merge pull request #4015 from schneems/schneems/routing_error_help	José Valim	2011-12-17	1	-8/+13
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Add Help Text to Routing Error
\| * \| \| \|	add help text to routing error	schneems	2011-12-17	1	-8/+13
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a newcomer hits the routing error page they are often confused about how to trouble shoot the next step. Adding a simple help text can gently remind coders where to get more help.
* \| \| \|	Add campfire notifications for travis	Santiago Pastorino	2011-12-17	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #4012 from JustinCampbell/master	José Valim	2011-12-17	2	-1/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Allow symbols to be passed as extension aliases in Mime::Type.register
\| * \| \| \|	Add test for register_alias	Justin Campbell	2011-12-17	1	-0/+9
\| \| \| \| \|
\| * \| \| \|	Add test for type aliases	Justin Campbell	2011-12-17	1	-0/+11
\| \| \| \| \|
\| * \| \| \|	Allow symbols to be passed for extension aliases	Justin Campbell	2011-12-17	2	-1/+12
\| \| \| \| \|
* \| \| \| \|	Use gem versions of sass-rails and coffee-rails.	José Valim	2011-12-17	1	-10/+26
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge pull request #4010 from arunagw/fix_test_activemodel	José Valim	2011-12-17	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixed test "ArgumentError: wrong number of arguments(1 for 0)"
\| * \| \| \|	Fixed test "ArgumentError: wrong number of arguments(1 for 0)"	Arun Agrawal	2011-12-17	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #4008 from arunagw/warning_variable_for_layout	José Valim	2011-12-16	1	-0/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	warning removed "warning: instance variable @variable_for_layout not ini...
\| * \| \|	warning removed "warning: instance variable @variable_for_layout not ↵	Arun Agrawal	2011-12-17	1	-0/+1
\|/ / / \| \| \| \| \| \| \| \| \|	initialized"
* \| \|	Merge pull request #4007 from exviva/expand_cache_key_for_one_element_array	José Valim	2011-12-16	2	-8/+16
\|\ \ \ \| \| \| \| \| \| \| \|	Fix expanding cache key for single element arrays