Merged r14118 from trunk to 2.6-stable

Gemfile: remove "ffi"

ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252

r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.

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

1 files changed, 0 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index eb2bbcd27..eaaf71cba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,8 +93,6 @@ 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