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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove i18n dependencies from AP and AMo since they are in AS.	José Valim	2011-12-20	2	-2/+0
*	remove more uses of deprecated logger methods	Aaron Patterson	2011-12-19	3	-6/+8
*	Revert "Update .travis.yml"	Aaron Patterson	2011-12-19	1	-0/+1
*	Update .travis.yml	Guillermo Iguaran	2011-12-19	1	-1/+0
*	* BufferedLogger is deprecated. Use ActiveSupport::Logger, or the logger	Aaron Patterson	2011-12-19	17	-180/+50
*	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.	Juan M. Cuello	2011-12-19	1	-9/+22
* \|	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
*	Merge pull request #4030 from Juanmcuello/database_tasks	José Valim	2011-12-19	1	-9/+20
\|\
\| *	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
\|\
\| *	Rename STRUCTURE to DB_STRUCTURE, update dump task description and add simple...	Dieter Komendera	2011-12-18	2	-3/+11
\| *	Make structure file configureable in db:structure:dump analog to SCHEMA in db...	Dieter Komendera	2011-12-16	1	-12/+14
* \|	Merge pull request #4014 from lest/bypass-preloading-for-ids-reader	Jon Leighton	2011-12-18	2	-2/+16
\|\ \
\| * \|	bypass preloading for ids_reader	Sergey Nartimov	2011-12-18	2	-2/+16
* \| \|	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	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	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'	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 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	schneems	2011-12-17	1	-8/+13
\|/ / / /
* \| \| \|	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
\|\ \ \ \
\| * \| \| \|	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)"	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 initiali...	Arun Agrawal	2011-12-17	1	-0/+1
\|/ / /
* \| \|	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	Olek Janiszewski	2011-12-16	2	-8/+16
* \| \| \|	AS::Concern is not really needed for AR::Explain	Xavier Noria	2011-12-16	3	-73/+71
* \| \| \|	Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2	José Valim	2011-12-16	2	-1/+8
\|\ \ \ \
\| * \| \| \|	Fixed bug when error message is an empty string.	Antonio Roberto	2011-12-16	2	-1/+8
* \| \| \| \|	Merge pull request #3780 from marcbowes/master	Vijay Dev	2011-12-16	1	-7/+3
\|\ \ \ \ \
\| * \| \| \| \|	* A `/` is required if you want to explicitly skip the assets directory. This...	Marc Bowes	2011-11-28	1	-7/+3
* \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-16	2	-4/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #74 from abonec/master	Alexander	2011-12-15	1	-1/+1
\| \|\ \ \ \ \