Merged r14078.

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

diff --git a/Gemfile b/Gemfile
index 96725a370d1e3bbad78d5f216214837fab531ffb..d96e1b49b1444d0d1981f6488cb199a460287ff0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,6 +14,9 @@ gem "protected_attributes"
 gem "actionpack-action_caching"
 gem "actionpack-xml_parser"
 
+# building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414
+gem "ffi", "1.9.6"
+
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin, :jruby]
 gem "rbpdf", "~> 1.18.5"