aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-08 12:34:52 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-08 12:34:52 -0300
commit97ca81385eeda66925110a5d4d8c288977aac6eb (patch)
tree794d1443e74ac9a9d50c6ad3f619845e3dca1bec
parente385b853533e15223c89fccde8b20342bbe6528c (diff)
parent2af26960a86d03f1d134f232351b4301d4b07e91 (diff)
downloadrails-97ca81385eeda66925110a5d4d8c288977aac6eb.tar.gz
rails-97ca81385eeda66925110a5d4d8c288977aac6eb.tar.bz2
rails-97ca81385eeda66925110a5d4d8c288977aac6eb.zip
Merge pull request #15573 from bf4/mail_2_6_1_released
Mail 2.6.1 silences excessive warnings; remove Gemfile hack
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
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)