Merge branch 'release/0.16'0.16

1 files changed, 0 insertions, 15 deletions

diff --git a/lib/actionmailer_patches.rb b/lib/actionmailer_patches.rb
deleted file mode 100644
index 600d3c8cc..000000000
--- a/lib/actionmailer_patches.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Monkey patch for CVE-2013-4389
-# derived from http://seclists.org/oss-sec/2013/q4/118 to fix
-# a possible DoS vulnerability in the log subscriber component of
-# Action Mailer.
-
-require 'action_mailer'
-module ActionMailer
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def deliver(event)
-      recipients = Array.wrap(event.payload[:to]).join(', ')
-      info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)")
-      debug(event.payload[:mail])
-    end
-  end
-end