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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix t('.helper').	José Valim	2010-01-26	7	-26/+37
*	Bring AM tests back to green again.	José Valim	2010-01-26	3	-17/+3
*	Fix failing tests on AM about render(:body => Hash).	José Valim	2010-01-26	6	-68/+36
*	Merge branch 'master' of git://github.com/rails/rails	José Valim	2010-01-26	6	-2/+58
\|\
\| *	Failing AM test for legacy multipart alternative rendering	Joshua Peek	2010-01-26	3	-0/+39
\| *	Failing AM test for nested layouts	Joshua Peek	2010-01-26	3	-2/+19
* \|	Bring layouts with proc back alive.	José Valim	2010-01-26	2	-1/+18
* \|	Also include translation in ActionMailer.	José Valim	2010-01-26	1	-0/+1
\|/
*	Merge branch 'master' of git://github.com/rails/rails	José Valim	2010-01-26	1	-37/+33
\|\
\| *	Keep ActionController::Base.helpers_dir around for a bit longer	Joshua Peek	2010-01-26	1	-37/+33
* \|	Merge remote branch 'mikel/master'	José Valim	2010-01-26	7	-162/+252
\|\ \ \| \|/ \|/\|
\| *	Tidy up tests and docs.	José Valim and Mikel Lindsaar	2010-01-26	2	-20/+21
\| *	Fixing up tests and docs to use defaults :from => 'name' instead of defaults(...	Mikel Lindsaar	2010-01-27	2	-4/+5
\| *	Merge branch 'master' of github.com:mikel/rails	Mikel Lindsaar	2010-01-27	6	-28/+45
\| \|\
\| \| *	Update generators to use new defaults.	José Valim and Mikel Lindsaar	2010-01-26	2	-2/+2
\| \| *	Deprecate old defaults API.	José Valim and Mikel Lindsaar	2010-01-26	4	-32/+43
\| * \|	Fixed up documentation to reflect code change and cleaned up tests of spuriou...	Mikel Lindsaar	2010-01-27	2	-59/+58
\| * \|	Fixed up being able to pass random headers in with headers, or mail. Also, u...	Mikel Lindsaar	2010-01-27	2	-16/+50
\| \|/
\| *	Make defaults accept a hash.	José Valim and Mikel Lindsaar	2010-01-26	2	-79/+84
\| *	Updating generators for mailer to reflect changes in API	Mikel Lindsaar	2010-01-26	2	-5/+5
\| *	Fixing up expectations in base_test.rb	Mikel Lindsaar	2010-01-26	1	-10/+10
\| *	Implementing class level :defaults hash, instead of delivers_from et al	Mikel Lindsaar	2010-01-26	2	-16/+49
* \|	Add a test which ensures application can overwrite plugins/engines view paths.	José Valim	2010-01-26	1	-0/+19
* \|	Clean up Rails::Rack::Logger.	José Valim	2010-01-26	1	-11/+7
* \|	Move Rails::Rack::Metal to Rails::Application::Metal and just add cascade if ...	José Valim	2010-01-26	6	-5/+15
* \|	Middleware stack actually runs routes and not the application.	José Valim	2010-01-26	1	-1/+1
* \|	Add tests for explicit engines.	José Valim	2010-01-26	7	-55/+115
* \|	Remove old fixtures files.	José Valim	2010-01-26	47	-478/+0
* \|	Refactor railties test, break huge files in smaller chunks and move initiali...	José Valim	2010-01-26	16	-552/+632
* \|	Ensure app does not show up in generators.	José Valim	2010-01-26	2	-0/+2
* \|	Ensure proper class is shown on rake middleware.	José Valim	2010-01-26	1	-1/+1
* \|	Ensure calling a method in Rails::Application does not instantiate a void app...	José Valim	2010-01-26	2	-3/+10
* \|	PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so...	Jack Christensen	2010-01-25	4	-2/+54
\|/
*	Fix AR's rake tasks to work with the Rails::Application refactor	Carlhuda	2010-01-25	1	-1/+1
*	Merge remote branch 'mikel/master'	José Valim	2010-01-26	76	-1270/+2054
\|\
\| *	Fix small typo.	José Valim and Mikel Lindsaar	2010-01-26	1	-1/+1
\| *	Merge branch 'master' of github.com:mikel/rails	José Valim and Mikel Lindsaar	2010-01-26	2	-18/+36
\| \|\
\| \| *	Refactor content type setting, added tests to ensure boundary exists on multi...	José Valim and Mikel Lindsaar	2010-01-26	2	-18/+36
\| * \|	Remove old files, add some information to docs and improve test suite.	José Valim and Mikel Lindsaar	2010-01-26	4	-38/+58
\| \|/
\| *	More work on generated mailer templates.	José Valim and Mikel Lindsaar	2010-01-26	6	-16/+19
\| *	We don't support enriched yet	José Valim and Mikel Lindsaar	2010-01-26	1	-1/+0
\| *	Added initial documentation for the new API	José Valim and Mikel Lindsaar	2010-01-25	3	-119/+202
\| *	Change mailer generator templates and refactor the whole naming schema.	José Valim and Mikel Lindsaar	2010-01-25	10	-104/+165
\| *	Updated to mail 2.1.1	José Valim and Mikel Lindsaar	2010-01-25	1	-1/+1
\| *	Updated gemspec for Mail	José Valim and Mikel Lindsaar	2010-01-25	1	-1/+1
\| *	Got AM working with Mail yield on delivery_handler and updated tests	José Valim and Mikel Lindsaar	2010-01-25	7	-13/+23
\| *	changed test to get TestMailer to use :file delivery method directly (as setu...	José Valim and Mikel Lindsaar	2010-01-25	1	-3/+3
\| *	Added delivery_handler method to mail and implemented in ActionMailer to deli...	José Valim and Mikel Lindsaar	2010-01-25	4	-9/+43
\| *	Added delivers_from.	José Valim and Mikel Lindsaar	2010-01-25	2	-5/+18
\| *	Add some view paths tests.	José Valim and Mikel Lindsaar	2010-01-25	2	-23/+43