diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-06-15 14:13:34 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-06-15 14:17:00 +0200 |
| commit | f59ed560ac68aad47e56b6b0442b0b855ae9951e (patch) | |
| tree | a2b15a915bb75c99e7c1d5f4e37705b99f2cdf58 /actionmailer/lib/action_mailer/base.rb | |
| parent | a15704d7f35f17d34d0118546799141d6f853656 (diff) | |
| download | rails-f59ed560ac68aad47e56b6b0442b0b855ae9951e.tar.gz rails-f59ed560ac68aad47e56b6b0442b0b855ae9951e.tar.bz2 rails-f59ed560ac68aad47e56b6b0442b0b855ae9951e.zip | |
allow preview interceptors to be registered through `config.action_mailer`.
This was partially broken because `preview_interceptors=` just assigned the
raw values, whithout going through `register_preview_interceptor`. Now the
Action Mailer railtie takes care of the `preview_interceptors` option.
This commit is a partial revert of:
Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base"
This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing
changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be.
/cc @kuldeepaggarwal @y-yagi
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 893eca2eef..135cf35ac0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -340,7 +340,7 @@ module ActionMailer # end # end # - # ActionMailer::Base.register_preview_interceptor :css_inline_styler + # config.action_mailer.preview_interceptors :css_inline_styler # # Note that interceptors need to be registered both with <tt>register_interceptor</tt> # and <tt>register_preview_interceptor</tt> if they should operate on both sending and |