Merged r14078 and r14097 from trunk to 2.6-stable

Building ffi 1.9.7 fails in Ubuntu.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index eaaf71cba..eb2bbcd27 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,6 +93,8 @@ group :test do
   if RUBY_VERSION >= '1.9.3'
     gem "capybara"
     gem "selenium-webdriver"
+    # building ffi 1.9.7 fails in Ubuntu: https://github.com/ffi/ffi/issues/414
+    gem "ffi", "1.9.6"
   end
 end