Merged r17019 from trunk to 3.4-stable

Gemfile: pin mail gem version to prevent failure of MailHandlerTest#test_add_issue_with_localized_attributes

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17020 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index bd0bad4bb994e722ca2c6c6da662b6b2856fc635..2482aa9f9c2f9cb7c9f08606e43ddf0ec9d3e9ec 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem "actionpack-xml_parser"
 gem "roadie-rails", "~> 1.1.1"
 gem "roadie", "~> 3.2.1"
 gem "mimemagic"
+gem "mail", "~> 2.6.6"
 
 gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.7.2" : "~> 1.6.8")
 gem "i18n", "~> 0.7.0"