From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 4 Jan 2015 07:42:05 +0000 (+0000)
Subject: 2.6-stable: Gemfile: pin pg version 0.17 on all platforms
X-Git-Tag: 2.6.1~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6dea2fb61a07d592b383232d8e3644804164e0c2;p=redmine.git

2.6-stable: Gemfile: pin pg version 0.17 on all platforms

2.6-stable uses Rails 3.2 and passes test described at trunk r13839.
But this revision prevents unexpected changes due to pg version change.

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

diff --git a/Gemfile b/Gemfile
index 3a29f58a8..1353881f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,8 +62,7 @@ if File.exist?(database_file)
         gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
       when /postgresql/
-        gem "pg", (RUBY_VERSION < "1.9" ? "~> 0.17.1" : ">= 0.11.0"),
-                  :platforms => [:mri, :mingw]
+        gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw]
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
         gem "sqlite3", :platforms => [:mri, :mingw]