Browse Source

Merged r14175 from trunk to 3.0-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/3.0-stable@14176 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.0.2
Toshi MARUYAMA 9 years ago
parent
commit
524bd1479b
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      Gemfile

+ 2
- 1
Gemfile View File

@@ -68,7 +68,8 @@ if File.exist?(database_file)
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
when /sqlite3/
gem "sqlite3", :platforms => [:mri, :mingw, :x64_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, :x64_mingw]
gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]

Loading…
Cancel
Save