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

	Commit message (Expand)	Author	Age	Files	Lines
*	Build fix for ActionMailer	Arun Agrawal	2012-09-14	1	-0/+1
*	Merge pull request #7616 from lest/null-session-forgery-protection	Michael Koziarski	2012-09-13	4	-33/+159
\|\
\| *	Implement :null_session CSRF protection method	Sergey Nartimov	2012-09-13	4	-33/+159
* \|	Merge pull request #7628 from Pranas/deep_merge_with_block	Rafael Mendonça França	2012-09-13	3	-4/+23
\|\ \
\| * \|	Allow passing block to deep_merge and deep_merge!	Pranas Kiziela	2012-09-13	3	-4/+23
\|/ /
* \|	Copy-edit deprecation relared documentation [ci skip]	Rafael Mendonça França	2012-09-13	5	-74/+51
* \|	Merge pull request #7524 from al2o3cr/store_boolean	Rafael Mendonça França	2012-09-13	4	-9/+67
\|\ \
\| * \|	refactor store_accessor	Matt Jones	2012-09-13	4	-9/+67
\|/ /
* \|	Merge pull request #6348 from LTe/no_global_depreactations	Carlos Antonio da Silva	2012-09-13	9	-98/+412
\|\ \
\| * \|	Change ActiveSupport::Deprecation to class.	Piotr Niełacny	2012-09-13	9	-221/+405
\| * \|	extend ActiveSupport::Deprecation with self, allow other objects to extend/in...	Robert Pankowecki	2012-09-13	6	-102/+232
\|/ /
* \|	Merge pull request #7623 from tchandy/master	Rafael Mendonça França	2012-09-12	1	-1/+1
\|\ \
\| * \|	update ConnectionAdaptar::Column#type_cast_code to be compatible with 3.2 branch	Thiago Pradi	2012-09-13	1	-1/+1
\|/ /
* \|	Merge pull request #7614 from frodsan/scm_agnostic	Rafael Mendonça França	2012-09-12	6	-65/+90
\|\ \
\| * \|	change app/plugin generators to be more SCM agnostic	Derek Prior	2012-09-12	6	-65/+90
\|/ /
* \|	Pass in the model class rather than engine	Jon Leighton	2012-09-13	3	-8/+8
* \|	Refactor to remove some duplication	Jon Leighton	2012-09-12	2	-37/+24
* \|	Fix nested association references	Jon Leighton	2012-09-12	3	-41/+36
* \|	Merge pull request #7273 from beerlington/foreign_key_model_queries	Jon Leighton	2012-09-12	7	-5/+158
\|\ \
\| * \|	Accept belongs_to assoc. keys in ActiveRecord queries	beerlington	2012-09-11	7	-5/+158
* \| \|	Merge pull request #7622 from marcandre/doc	Carlos Antonio da Silva	2012-09-12	1	-8/+2
\|\ \ \
\| * \| \|	Update documentation for CollectionProxy	Marc-Andre Lafortune	2012-09-12	1	-8/+2
* \| \| \|	Remove the queue configuration from the environments templates since the	Rafael Mendonça França	2012-09-12	2	-4/+1
* \| \| \|	Updating the documentation to ActionMailer::Base.queue	Rafael Mendonça França	2012-09-12	3	-4/+16
* \| \| \|	Define a SynchronousQueue for test in Action Pack.	Rafael Mendonça França	2012-09-12	2	-6/+10
* \| \| \|	Allow users to configure the queue for the mailers	Rafael Mendonça França	2012-09-12	4	-13/+22
* \| \| \|	Use the SynchronousQueue as default in production and development.	Rafael Mendonça França	2012-09-12	3	-9/+10
\|/ / /
* \| \|	Merge pull request #7605 from revans/master	Carlos Antonio da Silva	2012-09-12	1	-1/+11
\|\ \ \
\| * \| \|	Added additional comments on how to use the "type" column without	Robert Evans	2012-09-12	1	-1/+11
* \| \| \|	Merge pull request #7521 from graceliu/fix_database_url_support	Rafael Mendonça França	2012-09-12	7	-32/+275
\|\ \ \ \
\| * \| \| \|	fixed support for DATABASE_URL for rake db tasks	Grace Liu	2012-09-11	7	-32/+275
* \| \| \| \|	Merge pull request #7612 from arunagw/build_fix_queue	Carlos Antonio da Silva	2012-09-12	1	-0/+6
\|\ \ \ \ \
\| * \| \| \| \|	Fix build Rails.queue	Arun Agrawal	2012-09-12	1	-0/+6
\| \|/ / / /
* \| \| \| \|	Merge pull request #7615 from NARKOZ/patch-2	Carlos Antonio da Silva	2012-09-12	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	remove '.rb' from require call	Nihad Abbasov	2012-09-12	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #7610 from arunagw/warning_removed_action_pack	José Valim	2012-09-12	2	-2/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	warning removed.	Arun Agrawal	2012-09-12	2	-2/+0
\|/ / / /
* \| \| \|	Action Mailer async flag is true by default using a Synchronous impl	Santiago Pastorino	2012-09-11	10	-79/+61
* \| \| \|	Merge pull request #7601 from jrochkind/connection_pool_unify_exceptions	Aaron Patterson	2012-09-11	2	-18/+12
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	ConnectionPool, unify exceptions, ConnectionTimeoutError	Jonathan Rochkind	2012-09-11	2	-18/+12
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #7564 from kennyj/using_mysqldump	Carlos Antonio da Silva	2012-09-11	3	-28/+30
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use configuration['encoding'], because database configuration use not charset...	kennyj	2012-09-12	2	-5/+5
\| * \|	Use native mysqldump command for 'rake db:structure:dump'.	kennyj	2012-09-12	3	-24/+26
\|/ /
* \|	Merge pull request #7488 from needfeed/master	Rafael Mendonça França	2012-09-11	2	-1/+9
\|\ \
\| * \|	Support MySQL SSL in rails dbconsole.	needfeed	2012-09-10	2	-1/+9
* \| \|	Merge pull request #7569 from skorfmann/improve-has-many-through-exception-me...	Carlos Antonio da Silva	2012-09-11	1	-1/+1
\|\ \ \
\| * \| \|	Improve exception message for HasManyThroughAssociationPolymorphicSourceError	Sebastian Korfmann	2012-09-10	1	-1/+1
* \| \| \|	Merge pull request #7594 from guilleiguaran/rb-template-handler	Rafael Mendonça França	2012-09-10	4	-0/+14
\|\ \ \ \
\| * \| \| \|	Add .rb template handler	Guillermo Iguaran	2012-09-11	4	-0/+14
* \| \| \| \|	Merge pull request #7586 from route/precompile-should-not-fail-quietly	Rafael Mendonça França	2012-09-10	1	-7/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|