aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/vendor/tmail.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-04 03:24:39 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-04 03:24:39 +0530
commitcda36a0731f14b33a920bf7e32255661e06f890a (patch)
tree79ccba37953f9fe3055503be42b1610faa6d64ad /actionmailer/lib/action_mailer/vendor/tmail.rb
parentbd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff)
parenta115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff)
downloadrails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz
rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2
rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor/tmail.rb')
-rw-r--r--actionmailer/lib/action_mailer/vendor/tmail.rb18
1 files changed, 0 insertions, 18 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail.rb b/actionmailer/lib/action_mailer/vendor/tmail.rb
deleted file mode 100644
index 60555605f6..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
- gem 'tmail', '~> 1.2.3'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.3"
-end
-
-module TMail
-end
-
-require 'tmail'
-
-require 'active_support/core_ext/kernel/reporting'
-silence_warnings do
- TMail::Encoder.const_set("MAX_LINE_LEN", 200)
-end