diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2015-03-02 13:47:24 +0100 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2015-03-02 16:55:27 +0100 |
| commit | 5140c07c026339e8b4db00fc054b3f5441b1db1a (patch) | |
| tree | cc782421a40999206eff56d969fe499607428ba8 | |
| parent | 823e4e91158a7e50a56fb92519fc50917b3b33fd (diff) | |
| download | rails-5140c07c026339e8b4db00fc054b3f5441b1db1a.tar.gz rails-5140c07c026339e8b4db00fc054b3f5441b1db1a.tar.bz2 rails-5140c07c026339e8b4db00fc054b3f5441b1db1a.zip | |
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.
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 9 insertions, 2 deletions
@@ -15,6 +15,7 @@ gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master' gem 'coffee-rails', '~> 4.1.0' gem 'turbolinks' gem 'arel', github: 'rails/arel', branch: 'master' +gem 'mail', github: 'mikel/mail' # require: false so bcrypt is loaded only when has_secure_password is used. # This is to avoid ActiveModel (and by extension the entire framework) diff --git a/Gemfile.lock b/Gemfile.lock index 4fc36bf86c..e34449a7b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,6 +12,13 @@ GIT 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 branch: master @@ -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) |