Merged r12172 from trunk to 2.3-stable (#14883)

Gemfile: update jdbc adapter version above 1.2.6.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12174 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA committed 2013-09-30 00:36:44 +00:00
1 parent 0a25ee385f
commit 7ec18933e0
1 file changed
+1 -1
+1 -1
View File
@@ -31,7 +31,7 @@ end
platforms :jruby do platforms :jruby do
# jruby-openssl is bundled with JRuby 1.7.0 # jruby-openssl is bundled with JRuby 1.7.0
gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
gem "activerecord-jdbc-adapter", "1.2.5" gem "activerecord-jdbc-adapter", "~> 1.2.6"
end end
# Include database gems for the adapters found in the database # Include database gems for the adapters found in the database