Merged r14118 from trunk to 3.0-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/3.0-stable@14126 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index afbc64562e2ae04783ecb98367040346b275776a..96725a370d1e3bbad78d5f216214837fab531ffb 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -96,8 +96,6 @@ group :test do
   # For running UI tests
   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
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")