aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Fixing mailer generators to use the right email addressMikel Lindsaar2010-01-271-1/+1
* | future proofing the sqlite3 adapter codeAaron Patterson2010-01-263-3/+12
* | AC railtie should configure helpers path.José Valim2010-01-263-6/+9
* | Fix t('.helper').José Valim2010-01-267-26/+37
* | Bring AM tests back to green again.José Valim2010-01-263-17/+3
* | Fix failing tests on AM about render(:body => Hash).José Valim2010-01-266-68/+36
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-01-266-2/+58
|\ \
| * | Failing AM test for legacy multipart alternative renderingJoshua Peek2010-01-263-0/+39
| * | Failing AM test for nested layoutsJoshua Peek2010-01-263-2/+19
* | | Bring layouts with proc back alive.José Valim2010-01-262-1/+18
* | | Also include translation in ActionMailer.José Valim2010-01-261-0/+1
|/ /
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2010-01-261-37/+33
|\ \
| * | Keep ActionController::Base.helpers_dir around for a bit longerJoshua Peek2010-01-261-37/+33
* | | Merge remote branch 'mikel/master'José Valim2010-01-267-162/+252
|\ \ \ | |/ / |/| |
| * | Tidy up tests and docs.José Valim and Mikel Lindsaar2010-01-262-20/+21
| * | Fixing up tests and docs to use defaults :from => 'name' instead of defaults(...Mikel Lindsaar2010-01-272-4/+5
| * | Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-276-28/+45
| |\ \
| | * | Update generators to use new defaults.José Valim and Mikel Lindsaar2010-01-262-2/+2
| | * | Deprecate old defaults API.José Valim and Mikel Lindsaar2010-01-264-32/+43
| * | | Fixed up documentation to reflect code change and cleaned up tests of spuriou...Mikel Lindsaar2010-01-272-59/+58
| * | | Fixed up being able to pass random headers in with headers, or mail. Also, u...Mikel Lindsaar2010-01-272-16/+50
| |/ /
| * | Make defaults accept a hash.José Valim and Mikel Lindsaar2010-01-262-79/+84
| * | Updating generators for mailer to reflect changes in APIMikel Lindsaar2010-01-262-5/+5
| * | Fixing up expectations in base_test.rbMikel Lindsaar2010-01-261-10/+10
| * | Implementing class level :defaults hash, instead of delivers_from et alMikel Lindsaar2010-01-262-16/+49
* | | Add a test which ensures application can overwrite plugins/engines view paths.José Valim2010-01-261-0/+19
* | | Clean up Rails::Rack::Logger.José Valim2010-01-261-11/+7
* | | Move Rails::Rack::Metal to Rails::Application::Metal and just add cascade if ...José Valim2010-01-266-5/+15
* | | Middleware stack actually runs routes and not the application.José Valim2010-01-261-1/+1
* | | Add tests for explicit engines.José Valim2010-01-267-55/+115
* | | Remove old fixtures files.José Valim2010-01-2647-478/+0
* | | Refactor railties test, break huge files in smaller chunks and move initiali...José Valim2010-01-2616-552/+632
* | | Ensure app does not show up in generators.José Valim2010-01-262-0/+2
* | | Ensure proper class is shown on rake middleware.José Valim2010-01-261-1/+1
* | | Ensure calling a method in Rails::Application does not instantiate a void app...José Valim2010-01-262-3/+10
* | | PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so...Jack Christensen2010-01-254-2/+54
|/ /
* | Fix AR's rake tasks to work with the Rails::Application refactorCarlhuda2010-01-251-1/+1
* | Merge remote branch 'mikel/master'José Valim2010-01-2676-1270/+2054
|\ \
| * | Fix small typo.José Valim and Mikel Lindsaar2010-01-261-1/+1
| * | Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-262-18/+36
| |\ \
| | * | Refactor content type setting, added tests to ensure boundary exists on multi...José Valim and Mikel Lindsaar2010-01-262-18/+36
| * | | Remove old files, add some information to docs and improve test suite.José Valim and Mikel Lindsaar2010-01-264-38/+58
| |/ /
| * | More work on generated mailer templates.José Valim and Mikel Lindsaar2010-01-266-16/+19
| * | We don't support enriched yetJosé Valim and Mikel Lindsaar2010-01-261-1/+0
| * | Added initial documentation for the new APIJosé Valim and Mikel Lindsaar2010-01-253-119/+202
| * | Change mailer generator templates and refactor the whole naming schema.José Valim and Mikel Lindsaar2010-01-2510-104/+165
| * | Updated to mail 2.1.1José Valim and Mikel Lindsaar2010-01-251-1/+1
| * | Updated gemspec for MailJosé Valim and Mikel Lindsaar2010-01-251-1/+1
| * | Got AM working with Mail yield on delivery_handler and updated testsJosé Valim and Mikel Lindsaar2010-01-257-13/+23
| * | changed test to get TestMailer to use :file delivery method directly (as setu...José Valim and Mikel Lindsaar2010-01-251-3/+3