Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merging 3.0.x CHANGELOGs | Guillermo Iguaran | 2011-05-10 | 1 | -1/+29 |
| | |||||
* | More updates to ivars list. | José Valim | 2011-05-06 | 2 | -1/+3 |
| | |||||
* | Move variables to underscore format, update protected instance variables list. | José Valim | 2011-05-06 | 1 | -3/+0 |
| | |||||
* | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
| | |||||
* | Updating to use Mail v2.3.0 | Mikel Lindsaar | 2011-04-26 | 2 | -6/+6 |
| | | | | | | Need to move the require of mail in test/abstract_unit to be after active support to make sure we use ActiveSupport multibyte handlers, otherwise, Mail will load its internal multibyte compat | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-19 | 1 | -0/+7 |
|\ | | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile | ||||
| * | brings a #:nodoc: back | Xavier Noria | 2011-04-19 | 1 | -1/+1 |
| | | |||||
| * | Undocumented :openssl_verify_mode option for smtp_settings | Florent Piteau | 2011-04-19 | 1 | -0/+4 |
| | | |||||
| * | docs for ActionMailer::Base.default_i18n_subject | Sebastian Martinez | 2011-04-18 | 1 | -1/+4 |
| | | |||||
* | | Updating mail to 2.2.16 | Mikel Lindsaar | 2011-04-16 | 1 | -1/+1 |
| | | |||||
* | | Fix missing requires in Action Mailer | Prem Sichanugrist | 2011-04-13 | 1 | -0/+1 |
|/ | | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-12 | 1 | -0/+13 |
|\ | |||||
| * | Made the defaults section a little more readable and more to the point, ↵ | simply-phi | 2011-04-04 | 1 | -71/+3 |
| | | | | | | | | giving a overview of the possibilities. | ||||
| * | Added information about default values | simply-phi | 2011-04-04 | 1 | -0/+81 |
| | | |||||
* | | AM register_interceptor and register_observer only constantize if the ↵ | Josh Kalderimis | 2011-04-06 | 1 | -2/+2 |
| | | | | | | | | argument is a String | ||||
* | | remove AM delegating register_observer and register_interceptor to Mail and ↵ | Josh Kalderimis | 2011-04-04 | 3 | -5/+73 |
|/ | | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 1 | -1/+1 |
|\ | |||||
| * | s/ERb/ERB/g (part II) | Akira Matsuda | 2011-04-03 | 1 | -1/+1 |
| | | |||||
* | | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 | Santiago Pastorino | 2011-04-02 | 1 | -2/+0 |
|/ | |||||
* | Fix typo | Santiago Pastorino | 2011-03-09 | 1 | -1/+1 |
| | |||||
* | publicise ActionMailer::MailHelper.format_paragraph | Diego Carrion | 2011-03-09 | 2 | -1/+21 |
| | | | | | | [#6550 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Rename conflicting ActionMailer::MailHelper#simple_format method | Mat Brown | 2011-03-09 | 1 | -2/+2 |
| | | | | | This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 1 | -2/+2 |
|\ | |||||
| * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | ||||
| * | s/a/an/ | Akira Matsuda | 2011-03-07 | 1 | -1/+1 |
| | | |||||
* | | Fixed indentation in actionmailer base_test [#6538 state:committed] | Dalibor Nasevic | 2011-03-07 | 1 | -2/+2 |
|/ | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Revert "Fixed identation in actionmailer base_test" | Xavier Noria | 2011-03-06 | 1 | -2/+2 |
| | | | | | | | | | Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0. | ||||
* | style changes | JudeArasu | 2011-03-06 | 1 | -3/+5 |
| | |||||
* | Revert "style changes" | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8. | ||||
* | style changes | JudeArasu | 2011-03-06 | 1 | -3/+3 |
| | |||||
* | styles applied for usage | JudeArasu | 2011-03-06 | 1 | -3/+4 |
| | |||||
* | Fixed identation in actionmailer base_test | Dalibor Nasevic | 2011-03-06 | 1 | -2/+2 |
| | |||||
* | typo changes | JudeArasu | 2011-03-05 | 1 | -3/+4 |
| | |||||
* | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-05 | 1 | -1/+1 |
| | |||||
* | No need of instance variable | Dalibor Nasevic | 2011-03-02 | 1 | -3/+3 |
| | | | | | | [#6502 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Fixed typos in asset_host_test | Dalibor Nasevic | 2011-03-02 | 1 | -2/+2 |
| | | | | | | [#6501 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 2 | -2/+2 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -1/+1 |
|\ | |||||
| * | fix typo | Vijay Dev | 2011-02-17 | 1 | -1/+1 |
| | | |||||
* | | removing text-format in favor of a more simple solution | Aaron Patterson | 2011-02-09 | 2 | -12/+19 |
|/ | |||||
* | Bump mail version up | Santiago Pastorino | 2011-01-28 | 1 | -1/+1 |
| | |||||
* | Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵ | José Valim | 2011-01-19 | 1 | -10/+6 |
| | | | | state:resolved] | ||||
* | Added a testcase for bug [#5329] | Frank Fischer | 2011-01-19 | 2 | -0/+54 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Removing unused method argument | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Cleaning up style, concat inside method calls is ugly | Mikel Lindsaar | 2011-01-18 | 1 | -9/+12 |
| | |||||
* | Fixing redundant escape in regex | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Should use standard ruby signature for respond_to | Mikel Lindsaar | 2011-01-18 | 1 | -1/+1 |
| | |||||
* | Fixing spelling | Mikel Lindsaar | 2011-01-18 | 1 | -2/+2 |
| | |||||
* | sorry, the CI cannot lie to us anymore (Part II) | Santiago Pastorino | 2011-01-13 | 1 | -1/+1 |
| | |||||
* | turn off deprecation silencing | Aaron Patterson | 2011-01-12 | 1 | -1/+8 |
| |