summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-09-30 00:36:44 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-09-30 00:36:44 +0000
commit7ec18933e09c9d2ac04556d1522bed5c4a4a6d35 (patch)
tree262f66fa002b11a30869b8a76cbfd9857808a7b1
parent0a25ee385f5ec146e0086d055e3222b9a05954e6 (diff)
downloadredmine-7ec18933e09c9d2ac04556d1522bed5c4a4a6d35.tar.gz
redmine-7ec18933e09c9d2ac04556d1522bed5c4a4a6d35.zip
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
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 1a6d25518..bcd269094 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ end
platforms :jruby do
# jruby-openssl is bundled with JRuby 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
# Include database gems for the adapters found in the database