From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 14 Apr 2015 12:58:10 +0000 (+0000)
Subject: Merged r14175 from trunk to 2.6-stable (#19252)
X-Git-Tag: 2.6.4~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=88c186c4235ca826a88aa287ace831fb43b55f09;p=redmine.git

Merged r14175 from trunk to 2.6-stable (#19252)

Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.

r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.

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

diff --git a/Gemfile b/Gemfile
index d7f64ca1f..806f40908 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,7 +66,8 @@ if File.exist?(database_file)
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
         gem "sqlite3", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcsqlite3-adapter", "1.3.11", :platforms => :jruby
+        gem "jdbc-sqlite3", "< 3.8", :platforms => :jruby
+        gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
       when /sqlserver/
         gem "tiny_tds", "~> 0.6.2", :platforms => [:mri, :mingw]
         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]