From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 10 May 2017 12:26:42 +0000 (+0000)
Subject: Merged r16546 from trunk to 3.3-stable (#25807)
X-Git-Tag: 3.3.4~19
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0c9cf4d445ebbab8f44950fbcf42ea4faca343ae;p=redmine.git

Merged r16546 from trunk to 3.3-stable (#25807)

Gemfile: pin roadie-rails version 1.1.

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

diff --git a/Gemfile b/Gemfile
index 4db6b5511..00d44b520 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"