From f3821dcbdaa3ee9562c91ee2cf271204b9599d94 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 7 Apr 2017 08:23:07 +0000 Subject: [PATCH] Merged r16515 and r16516 from trunk to 3.3-stable git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16518 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f003c044d..415d82ed2 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem "mimemagic" gem "nokogiri", "~> 1.6.8" gem "i18n", "~> 0.7.0" +gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" # Request at least rails-html-sanitizer 1.0.3 because of security advisories gem "rails-html-sanitizer", ">= 1.0.3" @@ -76,7 +77,8 @@ if File.exist?(database_file) gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby when /sqlite3/ - gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw] + gem "sqlite3", (RUBY_VERSION < "2.0" && RUBY_PLATFORM =~ /mingw/ ? "1.3.12" : "~>1.3.12"), + :platforms => [:mri, :mingw, :x64_mingw] gem "jdbc-sqlite3", ">= 3.8.10.1", :platforms => :jruby gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby when /sqlserver/ -- 2.39.5