From 2af26960a86d03f1d134f232351b4301d4b07e91 Mon Sep 17 00:00:00 2001
From: Benjamin Fleischer <github@benjaminfleischer.com>
Date: Sun, 8 Jun 2014 10:07:08 -0500
Subject: Mail 2.6.1 silences excessive warnings; remove Gemfile hack

Completes https://github.com/rails/rails/pull/15493

Revert "For our build, stick with mail 2.5.x for now"

This reverts commit b8f586a094c104006d29a87fee0d8b48d0af2d14.
---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Gemfile')

diff --git a/Gemfile b/Gemfile
index 86ac145b73..2a695df618 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,6 @@ gem 'coffee-rails', '~> 4.0.0'
 gem 'arel', github: 'rails/arel', branch: 'master'
 gem 'sprockets-rails', github: 'rails/sprockets-rails', branch: 'master'
 gem 'i18n', github: 'svenfuchs/i18n', branch: 'master'
-gem 'mail', '~> 2.5.4'
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid ActiveModel (and by extension the entire framework)
-- 
cgit v1.2.3