summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-11-05 19:40:41 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-11-05 19:40:41 +0000
commit9392fb59b66491f92920b905826495a01d7d3f38 (patch)
treee61275898aa918f66c1784a0f033e16de89795ef /Gemfile
parentdf1d0c2d582a0a891333779660b7899e04aed4f4 (diff)
downloadredmine-9392fb59b66491f92920b905826495a01d7d3f38.tar.gz
redmine-9392fb59b66491f92920b905826495a01d7d3f38.zip
Merged r17019 from trunk to 3.3-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.3-stable@17021 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index d0319e094..7201ef794 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"