Permalink
Browse files

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

2.6 currently has many warnings, which are failing the Travis build.

Conflicts:
	Gemfile
  • Loading branch information...
1 parent c3f6899 commit bea0d10222567d2c930f2a5005d32354b70ac415 @matthewd matthewd committed Jun 4, 2014
Showing with 2 additions and 0 deletions.
  1. +2 −0 Gemfile
View
@@ -7,6 +7,8 @@ gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 2.2.0'
gem 'turbolinks'
+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)
# being dependent on a binary library.

0 comments on commit bea0d10

Please sign in to comment.