From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Mar 2015 15:14:01 +0000 (+0000)
Subject: Merged r14078.
X-Git-Tag: 3.0.1~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a26ce6a75e308a6d5a034f8c33925ae509185c3;p=redmine.git

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 96725a370..d96e1b49b 100644
--- 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"