diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-29 15:08:50 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-29 15:08:50 -0300 |
| commit | 754ca9709d8a02d874f72cce8ba23e6f20a51081 (patch) | |
| tree | 507e4cd18b2a73bc752286829f476529866603ff | |
| parent | f7c0d133f982e4607c8b78e13fef6edafa7eb590 (diff) | |
| parent | 9575f4fdca7d3bc4b1ded9d49d6c127eee96b4a4 (diff) | |
| download | rails-754ca9709d8a02d874f72cce8ba23e6f20a51081.tar.gz rails-754ca9709d8a02d874f72cce8ba23e6f20a51081.tar.bz2 rails-754ca9709d8a02d874f72cce8ba23e6f20a51081.zip | |
Merge pull request #20367 from manishspuri/master
minor text change [ci skip]
| -rw-r--r-- | actionmailer/lib/action_mailer/inline_preview_interceptor.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/log_subscriber.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/inline_preview_interceptor.rb b/actionmailer/lib/action_mailer/inline_preview_interceptor.rb index dea5e52f0c..ca4cffc7b5 100644 --- a/actionmailer/lib/action_mailer/inline_preview_interceptor.rb +++ b/actionmailer/lib/action_mailer/inline_preview_interceptor.rb @@ -5,7 +5,7 @@ module ActionMailer # that use inline cid: style urls to data: style urls so that they are visible # when previewing a HTML email in a web browser. # - # This interceptor is enabled by default, to remove it delete it from the + # This interceptor is enabled by default, to remove it from the # <tt>ActionMailer::Base.preview_interceptors</tt> array: # # ActionMailer::Base.preview_interceptors.delete(ActionMailer::InlinePreviewInterceptor) diff --git a/actionmailer/lib/action_mailer/log_subscriber.rb b/actionmailer/lib/action_mailer/log_subscriber.rb index 5b57c75ec3..c2f671fdac 100644 --- a/actionmailer/lib/action_mailer/log_subscriber.rb +++ b/actionmailer/lib/action_mailer/log_subscriber.rb @@ -2,7 +2,7 @@ require 'active_support/log_subscriber' module ActionMailer # Implements the ActiveSupport::LogSubscriber for logging notifications when - # email is delivered and received. + # email is delivered or received. class LogSubscriber < ActiveSupport::LogSubscriber # An email was delivered. def deliver(event) |