aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* The name for the plain text template in Rails3 appears to be ↵Jason Fox2011-06-151-4/+4
| | | | method.text.erb, not, method.text.plain.erb. Updated the doc to reflect this change. Also fixed a reference to an example that was incorrect.
* fix typoVijay Dev2011-06-081-1/+1
|
* Add action_mailer observer and interceptors configuration optionsPaco Guzman2011-06-071-4/+4
|
* minor typo in the rdoc about Interceptor.Teng Siong Ong2011-05-281-1/+1
|
* minor spacing fix in code example in ActionMailer::Base.Teng Siong Ong2011-05-281-8/+8
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-251-6/+6
|\ | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * Remove extra white spaces on ActionMailer docs.Sebastian Martinez2011-05-231-7/+7
| |
* | Removed deprecated ActionMailer API and related testsJosh Kalderimis2011-05-241-21/+3
|/
* More updates to ivars list.José Valim2011-05-061-0/+2
|
* Move variables to underscore format, update protected instance variables list.José Valim2011-05-061-3/+0
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-191-0/+7
|\ | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
| * brings a #:nodoc: backXavier Noria2011-04-191-1/+1
| |
| * Undocumented :openssl_verify_mode option for smtp_settingsFlorent Piteau2011-04-191-0/+4
| |
| * docs for ActionMailer::Base.default_i18n_subjectSebastian Martinez2011-04-181-1/+4
| |
* | Fix missing requires in Action MailerPrem Sichanugrist2011-04-131-0/+1
|/ | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com>
* AM register_interceptor and register_observer only constantize if the ↵Josh Kalderimis2011-04-061-2/+2
| | | | argument is a String
* remove AM delegating register_observer and register_interceptor to Mail and ↵Josh Kalderimis2011-04-041-3/+27
| | | | | | 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>
* Correct spelling for Base64 in action_mailerDalibor Nasevic2011-03-051-1/+1
|
* fix typoVijay Dev2011-02-171-1/+1
|
* Should use standard ruby signature for respond_toMikel Lindsaar2011-01-181-1/+1
|
* Fixing spellingMikel Lindsaar2011-01-181-2/+2
|
* A bunch of cleanup on the inherited template patchwycats2010-12-261-9/+2
|
* Merge branch 'master' of https://github.com/peterb/docrails into peterb-masterAditya Sanghi2010-11-291-1/+3
|\
| * Explain actionamailer authentication typesPeter Baker2010-10-141-1/+3
| |
* | Merge branch 'master' of github.com:lifo/docrailsRyan Bigg2010-11-261-2/+2
|\ \ | | | | | | | | | | | | * 'master' of github.com:lifo/docrails: Fix missing word in ActionMailer::Base documentation.
| * | Fix missing word in ActionMailer::Base documentation.Cheah Chu Yeow2010-11-251-2/+2
| |/
* / Update ActionMailer documentation to not use deprecated template_root method ↵Ryan Bigg2010-11-261-1/+1
|/ | | | as documentation, but rather raise_delivery_errors method
* self is implied, so remove selfAaron Patterson2010-09-291-1/+1
|
* dry up method missingAaron Patterson2010-09-291-5/+2
|
* We don't need to clear action_methods on inherited hook as they are cleaned ↵Piotr Sarnacki2010-09-031-5/+0
| | | | on method_added hook
* ActionMailer should not depend on ActionDispatchPiotr Sarnacki2010-09-031-2/+1
|
* Refactor ActionMailer to not use hide_actionsPiotr Sarnacki2010-09-031-8/+3
|
* Include routes helpers only for inherited classes in ActionMailerPiotr Sarnacki2010-09-031-21/+9
|
* Deprecate the old mailer API that was not deprecated yet.José Valim2010-08-291-1/+7
|
* Remove the deprecated API from ActionMailer.José Valim2010-08-291-1/+0
|
* Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵Santiago Pastorino2010-08-141-11/+11
| | | | 's/[ \t]*$//' -i {} \;)
* Merge remote branch 'rails/master'Xavier Noria2010-07-301-2/+2
|\
| * edit pass to apply API guideline wrt the use of "# =>" in example codeXavier Noria2010-07-301-2/+2
| |
* | itsy bitsy changes to ActionMailer documentationNeeraj Singh2010-07-281-14/+11
|/
* Mention that ActionMailer::Base.default_url_options is now deprecatedJeroen van Dijk2010-07-221-5/+4
|
* Fixed many references to the old config/environment.rb and Rails::InitializerBenjamin Quorning2010-07-131-1/+1
|
* Fixes for "router" and "routes" terminologyWincent Colaiuta2010-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f7ba614c2db improved the internal consistency of the different means of accessing routes, but it introduced some problems at the level of code comments and user-visible strings. This commit applies fixes on three levels: Firstly, we remove or replace grammatically invalid constructs such as "a routes" or "a particular routes". Secondly, we make sure that we always use "the router DSL" or "the router syntax", because this has always been the official terminology. Finally, we make sure that we only use "routes" when referring to the application-specific set of routes that are defined in the "config/routes.rb" file, we use "router" when referring on a more abstract level to "the code in Rails used to handle routing", and we use "routing" when we need an adjective to apply to nouns such as "url_helpers. Again this is consistent with historical practice and other places in the documentation. Note that this is not a sweep over the entire codebase to ensure consistent usage of language; it is just a revision of the changes introduced in commit f7ba614c2db. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Unify routes naming by renaming router to routesPiotr Sarnacki2010-07-021-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* docs: note that mail() accepts arbitrary headersWincent Colaiuta2010-06-301-1/+3
| | | | | | | | | The documentation makes it sound like mail() only accepts a limited set of headers in the headers hash, but it in fact accepts any arbitrary headers, and there is a test ("can pass random headers in as a hash to mail") for it in the test suite. Signed-off-by: Wincent Colaiuta <win@wincent.com>
* Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵José Valim2010-06-241-0/+1
| | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
* Changes call backs to callbacks.Rizwan Reza2010-06-151-1/+1
|
* Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-151-1/+1
|\
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-111-4/+4
| |
* | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-141-2/+2
| | | | | | | | not "ActiveRecord"
* | docfix (email instead of emai)David Chelimsky2010-06-131-3/+3
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>