From 6116344f8e7b99106c0a0e01378648eeec30dafe Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 3 Jan 2015 16:23:53 +0000 Subject: [PATCH] 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 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a361dcc4a..a06a5bab8 100644 --- 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] -- 2.39.5