diff options
| author | Rafael França <rafael@franca.dev> | 2019-07-26 16:00:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 16:00:44 -0400 |
| commit | abaa73f34ae71362e0c61e212106ddc2a62f8b02 (patch) | |
| tree | 903fd64f03f40ed41fb400cd96d45fee53a9ccf1 /actionmailer/lib | |
| parent | dd6032d02740299ac7ca09740dcae419c6a29ae7 (diff) | |
| parent | efeddb08dae3dc6240118444234e3acdcfdffaa1 (diff) | |
| download | rails-abaa73f34ae71362e0c61e212106ddc2a62f8b02.tar.gz rails-abaa73f34ae71362e0c61e212106ddc2a62f8b02.tar.bz2 rails-abaa73f34ae71362e0c61e212106ddc2a62f8b02.zip | |
Merge pull request #36227 from betesh/avoid-misleading-error-about-late-attachments
Prevent reading inline attachments after `mail` was called from raising an inaccurate exception
Diffstat (limited to 'actionmailer/lib')
| -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 ba914c4813..eb0885953b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -737,7 +737,7 @@ module ActionMailer end class LateAttachmentsProxy < SimpleDelegator - def inline; _raise_error end + def inline; self end def []=(_name, _content); _raise_error end private |