aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* self.defaults => defaultJeremy Kemper2010-01-271-3/+4
|
* Remove unbundle changelogsJeremy Kemper2010-01-272-9/+1
|
* Merge remote branch 'mikel/master'Jeremy Kemper2010-01-27157-19756/+14
|\
| * Unvendor'd text-format, now requires text-format gemMikel Lindsaar2010-01-285-1478/+4
| |
| * Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a ↵Mikel Lindsaar2010-01-286-1157/+5
| | | | | | | | dependency - Don't forget to gem bundle buys and girls
| * Unvendor'd Builder. Now requires the Builder gem as a dependencyMikel Lindsaar2010-01-2810-1041/+3
| |
| * Unbundling TZInfoMikel Lindsaar2010-01-28142-16082/+4
| |
| * Updated mail requirement to 2.1.2Mikel Lindsaar2010-01-281-1/+1
|/
* Adding custom yaml (de-)serialization for OrderedHashGregor Schmidt2010-01-273-1/+48
| | | | | | [#3608 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fixed bug on HTML only emails getting set to text/plainMikel Lindsaar2010-01-284-1/+21
|
* Update bundled TZInfo to v0.3.16Geoff Buesing2010-01-26142-120/+124
|
* Georgetown TimeZone is now mapped to "America/Guyana" instead of ↵Geoff Buesing2010-01-263-3/+29
| | | | "America/Argentina/San_Juan" [#1821 status:resolved]
* Merge remote branch 'fxn/master'Jeremy Kemper2010-01-268-264/+0
|\
| * removes now void extending.rbXavier Noria2010-01-263-6/+0
| |
| * removes Object#extended_byXavier Noria2010-01-262-11/+0
| |
| * removes unused method Object#extend_with_included_modules_fromXavier Noria2010-01-262-19/+0
| |
| * deletes no void files removal.rb and class_test.rbXavier Noria2010-01-266-29/+0
| |
| * removes unused method Class#remove_classXavier Noria2010-01-262-48/+0
| |
| * removes unused method Class#reachable?Xavier Noria2010-01-261-5/+0
| |
| * removes unused Class#descedentsXavier Noria2010-01-261-34/+0
| |
| * removes unused Object#subclasses_ofXavier Noria2010-01-262-61/+0
| |
| * removes unused Object#remove_subclasses_ofXavier Noria2010-01-261-4/+0
| |
| * removes unused Class#remove_subclassesXavier Noria2010-01-262-30/+0
| |
| * removes unused method Class#subclassesXavier Noria2010-01-262-17/+0
| |
* | 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
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* | 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 ↵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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:42:24 +0000