summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-11-05 19:42:42 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-11-05 19:42:42 +0000
commit04da8a37fe7fe5d3b17e41946707e39219f46420 (patch)
tree5e4bdb6f3f03e4c5c713934fa9b9ba46d49d7a88
parent46add754c09408ebddcb9fa635e84d0e5d1f61c9 (diff)
downloadredmine-04da8a37fe7fe5d3b17e41946707e39219f46420.tar.gz
redmine-04da8a37fe7fe5d3b17e41946707e39219f46420.zip
Merged r17019 from trunk to 3.2-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.2-stable@17022 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index f1cae3e1f..61487b0be 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,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"