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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch '3-2-stable' of github.com:rails/rails into 3-2-stable	Aaron Patterson	2011-12-22	1	-1/+1
\|\
\| *	Merge pull request #4128 from arunagw/doc_fixes_3_2-stable	Piotr Sarnacki	2011-12-22	1	-1/+1
\| \|\
\| \| *	[docs] added missing "}" fixes #4126	Arun Agrawal	2011-12-22	1	-1/+1
\| \|/
* /	Revert "Added Enumerable#pluck to wrap the common pattern of collect(&:method...	Aaron Patterson	2011-12-22	3	-19/+3
\|/
*	just require things once	Aaron Patterson	2011-12-21	1	-4/+2
*	append puts the routes after the default, which causes a 404. instead use pre...	Aaron Patterson	2011-12-21	1	-1/+1
*	raises an ArgumentError if no valid options are given to TemplateRenderer#det...	Lucas Mazza	2011-12-21	2	-4/+13
*	added failing tests for has_many, has_one and belongs_to associations with st...	Jakub Kuźma	2011-12-21	4	-13/+66
*	Move SubTestTask. Soften up tests.	Jeremy Kemper	2011-12-21	3	-48/+44
*	adding integration test for journey #7	Aaron Patterson	2011-12-21	1	-0/+22
*	caches should not be global, so no need to clear in the teardown	Aaron Patterson	2011-12-21	1	-4/+0
*	Rails::SubTestTask warns on test failure and moves on. Renamed from TestTaskW...	Jeremy Kemper	2011-12-21	1	-43/+40
*	Doc fixes on Rails::Generators::Base.hook_for.	Hendy Tanata	2011-12-21	1	-3/+3
*	Merge pull request #4080 from heimidal/3-2-stable	José Valim	2011-12-20	2	-1/+19
\|\
\| *	Check for response to `#last` instead of `#first`.	Brian Rose	2011-12-20	1	-1/+1
\| *	Ensure option for select helper responds to `#first` before comparison.	Brian Rose	2011-12-20	2	-1/+19
\|/
*	Merge pull request #4069 from arunagw/issue_4067	Santiago Pastorino	2011-12-20	1	-1/+1
\|\
\| *	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	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
* \|	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
* \|	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
* \|	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.	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
\|/ / / /