]> source.dussan.org Git - redmine.git/commitdiff
Merged r14097 from trunk to 3.0-stable
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 14 Mar 2015 16:32:22 +0000 (16:32 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 14 Mar 2015 16:32:22 +0000 (16:32 +0000)
Gemfile: move "ffi" definition to :test group

Depending:
selenium-webdriver -> childprocess -> ffi

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

Gemfile

diff --git a/Gemfile b/Gemfile
index d96e1b49b1444d0d1981f6488cb199a460287ff0..afbc64562e2ae04783ecb98367040346b275776a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -14,9 +14,6 @@ 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"
@@ -99,6 +96,8 @@ 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")