From b0f35cbf6a9d555d2c6535bca25648ee024ee72e Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sun, 24 Aug 2014 00:43:08 -0700
Subject: [PATCH] Lock `mail` gem to ~> 2.5.4

Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
However, mail gem 2.6.x currently does not work with discourse because of the
reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse
would continue to work with Rails 4.1.6+ when it is released.
---
 Gemfile      | 2 ++
 Gemfile.lock | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 60919ca63b1..163e0671d78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -80,6 +80,8 @@ else
 end
 gem 'rails-observers'
 
+gem 'mail', '~> 2.5.4'
+
 #gem 'redis-rails'
 gem 'hiredis'
 gem 'redis', require:  ["redis", "redis/connection/hiredis"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 485301a2e19..83d6b3de7b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -436,6 +436,7 @@ DEPENDENCIES
   listen (= 0.7.3)
   logster
   lru_redux
+  mail (~> 2.5.4)
   memory_profiler
   message_bus
   minitest