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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3790 from masterkain/patch-1	Vijay Dev	2011-11-29	1	-1/+1
\|\ \| \| \| \|	Fix typo in AS::TaggedLogging
\| *	Fix typo in AS::TaggedLogging	Claudio Poli	2011-11-29	1	-1/+1
\| \|
* \|	Merge pull request #3793 from marcandre/asset_host	José Valim	2011-11-28	2	-2/+10
\|\ \ \| \|/ \|/\|	Handle correctly optional parameters for callable asset_host.
\| *	Handle correctly optional parameters for callable asset_host.	Marc-Andre Lafortune	2011-11-29	2	-2/+10
\|/
*	remove unused instance variable	Aaron Patterson	2011-11-28	1	-1/+0
\|
*	just check in all connections	Aaron Patterson	2011-11-28	1	-6/+2
\|
*	remove useless class_eval	Aaron Patterson	2011-11-28	1	-2/+0
\|
*	Move connection resoluion logic to it's own testable class.	Aaron Patterson	2011-11-28	3	-92/+115
\|
*	clean up string => hash conversion for connection pool	Aaron Patterson	2011-11-28	1	-19/+17
\|
*	pools are 1:1 with spec now rather than 1:1 with class	Aaron Patterson	2011-11-28	4	-7/+8
\|
*	break establish_connection to smaller methods	Aaron Patterson	2011-11-28	2	-33/+43
\|
*	added information about callbacks created by autosave association (#3639)	Jakub Kuźma	2011-11-28	1	-4/+16
\|
*	Merge pull request #3768 from janv/master	Aaron Patterson	2011-11-28	2	-1/+12
\|\ \| \| \| \|	Test and fix for Issue 3450
\| *	Test case and fix for rails/rails#3450	Jan Varwig	2011-11-27	2	-1/+12
\| \| \| \| \| \| \| \|	Asssigning a parent id to a belongs_to association actually updates the object that is validated when the association has :validates => true
* \|	Merge pull request #3785 from lest/backtrace-cleaner-env	José Valim	2011-11-28	4	-18/+27
\|\ \ \| \| \| \| \| \|	Put backtrace_cleaner to env
\| * \|	put backtrace_cleaner to env	lest	2011-11-28	4	-18/+27
\|/ /
* \|	Merge pull request #3783 from HeeL/master	Vijay Dev	2011-11-28	1	-1/+1
\|\ \ \| \| \| \| \| \|	fixed a typo in a travis message
\| * \|	fixed a typo in a message when there is no failuresin a build	Sergey Parizhskiy	2011-11-28	1	-1/+1
\|/ /
* \|	Merge pull request #3278 from arunagw/rails_rake_task_warning	José Valim	2011-11-28	1	-0/+1
\|\ \ \| \| \| \| \| \|	Global variable `$rails_rake_task' not initialized Warning removed
\| * \|	global variable `$rails_rake_task' not initialized Warning removed	Arun Agrawal	2011-11-28	1	-0/+1
\|/ /
* \|	Merge pull request #3657 from arunagw/mysql2_bump_master	José Valim	2011-11-28	2	-2/+2
\|\ \ \| \| \| \| \| \|	Bump Mysql2!
\| * \|	Bump Mysql2!	Arun Agrawal	2011-11-22	2	-2/+2
\| \| \|
* \| \|	Revert "use any? to check for size"	Vijay Dev	2011-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit c4af5f00f602b9e1c3166872902265836daf321b.
* \| \|	Revert "Use any instead of length"	José Valim	2011-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1756629835d39f60ef4c96aff81ac503c71b98b7.
* \| \|	Revert "Used any? instead of length call"	Xavier Noria	2011-11-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: This is slower, and any? is not equivalent in the general case. See discussion in https://github.com/rails/rails/pull/3779 This reverts commit 20cbf8eddc3844126d20f1218f068889d17b0dcf.
* \| \|	Merge pull request #3776 from nashby/add-namespace-to-form	José Valim	2011-11-27	3	-2/+95
\|\ \ \ \| \| \| \| \| \| \| \|	add namespace options to form_for
\| * \| \|	update CHANGELOG	Vasiliy Ermolovich	2011-11-28	1	-0/+10
\| \| \| \|
\| * \| \|	add namespace options to form_for	Vasiliy Ermolovich	2011-11-27	2	-2/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can provide a namespace for your form to ensure uniqueness of id attributes on form elements. The namespace attribute will be prefixed with underscore on the generate HTML id
* \| \| \|	Merge pull request #3779 from rahul100885/rahul100885_work	José Valim	2011-11-27	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Used any? instead of length call
\| * \| \| \|	Used any? instead of length call	Rahul P. Chaudhari	2011-11-28	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #3748 from samsonasu/has_many_custom_pk_new_record	Jon Leighton	2011-11-27	3	-2/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	New records should load has_many relationships with custom primary keys
\| * \| \| \|	load has_many associations keyed off a custom primary key if that key is ↵	Brian Samson	2011-11-25	3	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	present but the record is unsaved
* \| \| \| \|	Merge pull request #3773 from rahul100885/rahul100885_work	Santiago Pastorino	2011-11-27	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use any instead of length
\| * \| \| \| \|	Use any instead of length	Rahul P. Chaudhari	2011-11-27	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #3771 from kennyj/fix_rake_test_warnings	José Valim	2011-11-27	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Call a block passed rake_tasks method in the self context
\| * \| \| \|	Call a block passed rake_tasks method in the self context	kennyj	2011-11-27	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #3769 from kennyj/fix_index_html	José Valim	2011-11-27	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	avoid url started with "/" for the rails.png in public/index.html
\| * \| \| \|	avoid absolute path for the rails.png in index.html	kennyj	2011-11-27	2	-1/+2
\| \|/ / /
* \| \| \|	Merge pull request #3772 from lest/label-with-block	José Valim	2011-11-27	3	-2/+13
\|\ \ \ \ \| \|/ / / \|/\| \| \|	fix label with block in erb
\| * \| \|	fix label with block in erb	lest	2011-11-27	3	-2/+13
\|/ / /
* \| \|	Merge pull request #3767 from tadast/object_in	Yehuda Katz	2011-11-26	2	-7/+27
\|\ \ \ \| \| \| \| \| \| \| \|	Object#in? also accepts multiple parameters
\| * \| \|	Object#in? also accepts multiple parameters	Tadas Tamošauskas	2011-11-26	2	-7/+27
\| \| \| \|
* \| \| \|	Merge pull request #3765 from qoobaa/orm-instance-fix	José Valim	2011-11-26	2	-1/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	added tests to #3763
\| * \| \| \|	added tests, replaced classify with constantize - using classify here cuts ↵	Jakub Kuźma	2011-11-26	2	-1/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the last 's' in ORM name
* \| \| \| \|	Merge pull request #3763 from qoobaa/orm-instance-fix	José Valim	2011-11-26	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	allow using orm_instance without invoking orm_class in generators
\| * \| \| \|	allow using orm_instance without invoking orm_class first in generators	Jakub Kuźma	2011-11-26	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	add more tests for monday and sunday methods	Vijay Dev	2011-11-26	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3764 from arunagw/test_sunday_monday	Vijay Dev	2011-11-26	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Tests added for monday and sunday
\| * \| \| \| \|	Tests added for monday and sunday	Arun Agrawal	2011-11-26	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reference commits : a8f2860d0e7db86c61bb70935006100b04667ab1 80ac4dc6d0632937ccf61b38bc15fc2f6e27b18b
* \| \| \| \| \|	documenting monday and sunday methods	Vijay Dev	2011-11-26	1	-0/+11
\|/ / / / /