aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/vendor.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-11-07 19:29:21 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-11-07 19:29:21 +0000
commit709dc33c927652cc5ffb5758811e036336c95038 (patch)
treecc34c22e3ac0373a9c98c1c1414b14283ccfbb96 /actionmailer/lib/action_mailer/vendor.rb
parent57cde631383a8a0fa8d231ac1ae85ea725e12cd5 (diff)
downloadrails-709dc33c927652cc5ffb5758811e036336c95038.tar.gz
rails-709dc33c927652cc5ffb5758811e036336c95038.tar.bz2
rails-709dc33c927652cc5ffb5758811e036336c95038.zip
Rearrange vendor bundles so gem overrides work correctly.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor.rb')
-rw-r--r--actionmailer/lib/action_mailer/vendor.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/vendor.rb b/actionmailer/lib/action_mailer/vendor.rb
new file mode 100644
index 0000000000..0ad7386fd8
--- /dev/null
+++ b/actionmailer/lib/action_mailer/vendor.rb
@@ -0,0 +1,14 @@
+# Prefer gems to the bundled libs.
+require 'rubygems'
+
+begin
+ gem 'tmail', '~> 1.1.0'
+rescue Gem::LoadError
+ $:.unshift "#{File.dirname(__FILE__)}/vendor/tmail-1.1.0"
+end
+
+begin
+ gem 'text-format', '>= 0.6.3'
+rescue Gem::LoadError
+ $:.unshift "#{File.dirname(__FILE__)}/vendor/text-format-0.6.3"
+end