aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md
| * bumping versionAaron Patterson2013-02-101-1/+1
| |
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md
| * bumping versionAaron Patterson2013-01-081-1/+1
| |
* | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
|\| | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping)
| * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
| |
* | Backport #8450, the return value from mailer methods is not relevant.Yves Senn2012-12-101-4/+3
| | | | | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb
* | revised the actionmailer's CHANGELOG structureYves Senn2012-12-101-7/+8
|/
* Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
|
* Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
|
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
|
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
|
* Merge pull request #8048 from senny/7761_dont_render_view_without_mail_callRafael Mendonça França2012-10-281-1/+13
| | | | | | Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md
* Bump to 3.2.8Santiago Pastorino2012-08-091-1/+1
|
* Bump to 3.2.8.rc2Santiago Pastorino2012-08-031-1/+1
|
* Bump to 3.2.8.rc1Santiago Pastorino2012-08-011-2/+2
|
* bumping to 3.2.7Aaron Patterson2012-07-261-1/+1
|
* updating the versionAaron Patterson2012-07-231-2/+2
|
* bumping version numbersAaron Patterson2012-06-111-1/+1
|
* bumping to 3.2.5Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4Aaron Patterson2012-05-311-1/+1
|
* bumping to 3.2.4.rc1Aaron Patterson2012-05-281-2/+2
|
* Merge pull request #6018 from lest/patch-1Carlos Antonio da Silva2012-05-141-1/+2
| | | | mailer can be anonymous
* Bump up to 3.2.3Santiago Pastorino2012-03-301-1/+1
|
* Bumping to 3.2.3.rc2Santiago Pastorino2012-03-291-1/+1
|
* Bumping to 3.2.3.rc1Santiago Pastorino2012-03-271-2/+2
|
* bumping to 3.2.2Aaron Patterson2012-03-011-1/+1
|
* updating RAILS_VERSIONAaron Patterson2012-02-221-2/+2
|
* format lookup for partials is derived from the format in which the template ↵Santiago Pastorino2012-02-221-2/+2
| | | | | | is being rendered Closes #5025 part 2
* updating RAILS_VERSIONXavier Noria2012-01-261-1/+1
|
* Preparing for 3.2.0 releaseDavid Heinemeier Hansson2012-01-201-1/+1
|
* Bump to rc2Santiago Pastorino2012-01-041-1/+1
|
* Party like its R-C-UNO!David Heinemeier Hansson2011-12-191-1/+1
|
* Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365Piotrek Okoński2011-12-121-2/+3
|
* Using InstanceMethods in a Concern is deprecatedJeremy Kemper2011-11-301-10/+6
|
* Correct ActionMailer subject i18n lookup scope. Andrew France2011-10-201-1/+1
| | | The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct.
* normalize arg for ActionMailer::TestCase tests methodAlexey Vakhov2011-10-031-1/+8
|
* update ActionMailer example using last truncate helper method signatureAlexey Vakhov2011-09-261-2/+2
|
* Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
|
* singularize module and be explicit about what is deliveredMatt Jankowski2011-06-211-1/+1
|
* grammar (missing "a") and formattingMatt Jankowski2011-06-211-3/+3
|
* clarify why the only_path => false option is needed when default :host has ↵Matt Jankowski2011-06-211-4/+4
| | | | been set for mailers
* elaborate details on why to use _url instead of _path in mailersMatt Jankowski2011-06-211-2/+3
|
* typo changesJudeArasu2011-06-191-2/+3
|
* 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