Merged r13829 from trunk to 2.6-stable.

Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11.

1.3.13 breaks test/functional/issues_controller_test.rb.

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

diff --git a/Gemfile b/Gemfile
index a361dcc4afa60dd6d392bb4aaa6003d726537107..a06a5bab86e096c0a26087ff938bef1e94d02b57 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ if File.exist?(database_file)
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
         gem "sqlite3", :platforms => [:mri, :mingw]
-        gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+        gem "activerecord-jdbcsqlite3-adapter", "1.3.11", :platforms => :jruby
       when /sqlserver/
         gem "tiny_tds", "~> 0.6.2", :platforms => [:mri, :mingw]
         gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw]