diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-14 16:37:15 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-14 16:37:15 +0000 |
commit | f26f5fd101704b39c1be3232fac1ba33c205c4c6 (patch) | |
tree | 6c836e5570b05a70560a7a9bfb45baa6007d0228 | |
parent | ae1e3980b067aa097eda266932afdf1271c09538 (diff) | |
download | redmine-f26f5fd101704b39c1be3232fac1ba33c205c4c6.tar.gz redmine-f26f5fd101704b39c1be3232fac1ba33c205c4c6.zip |
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
-rw-r--r-- | Gemfile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 |