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

diff --git a/Gemfile b/Gemfile
index c1cf614262a1fc7a63ce6184fec46ed2df50af00..9e6d74ade6ee24882f9c8147cef0b81b0139e2f0 100644 (file)
--- 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"