summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-05-10 12:27:57 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-05-10 12:27:57 +0000
commit837bc019df36273295120ca26c89390dc413588b (patch)
treea7949d4cfda8a7a2d35d1ab9fcafc65933b7720b
parent7ca976e0c97e8d1d14c1e3a25f3a4bc47fd55150 (diff)
downloadredmine-837bc019df36273295120ca26c89390dc413588b.tar.gz
redmine-837bc019df36273295120ca26c89390dc413588b.zip
Merged r16546 from trunk to 3.2-stable (#25807)
Gemfile: pin roadie-rails version 1.1. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16548 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index c1cf61426..9e6d74ade 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
gem "protected_attributes"
gem "actionpack-action_caching"
gem "actionpack-xml_parser"
-gem "roadie-rails"
+gem "roadie-rails", "~> 1.1.1"
gem "mimemagic"
gem "nokogiri", "~> 1.6.8"