From 5140c07c026339e8b4db00fc054b3f5441b1db1a Mon Sep 17 00:00:00 2001
From: Robin Dupret <robin.dupret@gmail.com>
Date: Mon, 2 Mar 2015 13:47:24 +0100
Subject: Test against the mail gem's edge

The edge version ships with a patch that uses composition over
inheritance for the Mail::PartsList object (see mikel/mail#782).
Let's test Action Mailer against it to prevent eventual regressions
and experience it.

Moreover, this branch makes the Action Mailer suite green against
Rubinius.
---
 Gemfile.lock | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index 4fc36bf86c..e34449a7b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,6 +11,13 @@ GIT
       qu (= 0.2.0)
       redis-namespace
 
+GIT
+  remote: git://github.com/mikel/mail.git
+  revision: b159e0a542962fdd5e292a48cfffa560d7cf412e
+  specs:
+    mail (2.6.3.edge)
+      mime-types (>= 1.16, < 3)
+
 GIT
   remote: git://github.com/rails/arel.git
   revision: aac9da257f291ad8d2d4f914528881c240848bb2
@@ -123,8 +130,6 @@ GEM
       nokogiri
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
     mime-types (2.4.3)
     mini_portile (0.6.2)
@@ -250,6 +255,7 @@ DEPENDENCIES
   jquery-rails!
   json
   kindlerb (= 0.1.1)
+  mail!
   minitest (< 5.3.4)
   mocha (~> 0.14)
   mysql (>= 2.9.0)
-- 
cgit v1.2.3