aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Mikel Lindsaar2010-01-272-4/+5
| | | | | | | | defaults({:from => 'name'})
| * Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-276-28/+45
| |\ | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb
| | * 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 ↵Mikel Lindsaar2010-01-272-59/+58
| | | | | | | | | | | | spurious #deliver calls
| * | Fixed up being able to pass random headers in with headers, or mail. Also, ↵Mikel Lindsaar2010-01-272-16/+50
| |/ | | | | | | undeprecated headers(hash) as this works now too
| * 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
| | | | | | | | any metal was declared.
* | 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 ↵José Valim2010-01-2616-552/+632
| | | | | | | | initializers to application folder.
* | 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 ↵José Valim2010-01-262-3/+10
| | | | | | | | application.
* | PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc ↵Jack Christensen2010-01-254-2/+54
|/ | | | so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns [#3777 state:resolved]
* 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 ↵José Valim and Mikel Lindsaar2010-01-262-18/+36
| | | | | | | | | | | | multipart and fixed typo
| * | 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 ↵José Valim and Mikel Lindsaar2010-01-251-3/+3
| | | | | | | | setup action was resetting delivery_method to :test on init
| * Added delivery_handler method to mail and implemented in ActionMailer to ↵José Valim and Mikel Lindsaar2010-01-254-9/+43
| | | | | | | | deliver inside of instrumentation
| * Added delivers_from.José Valim and Mikel Lindsaar2010-01-252-5/+18
| |
| * Add some view paths tests.José Valim and Mikel Lindsaar2010-01-252-23/+43
| |
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-2459-914/+1214
| |\
| | * Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-2559-914/+1214
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb
| * | | Ensure implicit multipart templates with locale works as expected.José Valim and Mikel Lindsaar2010-01-246-0/+36
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 05:58:44 +0000