From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 4 Jan 2015 07:31:41 +0000 (+0000)
Subject: Gemfile: pin pg version 0.17
X-Git-Tag: 3.0.0~172
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bf5d58a76887c2d7819d9f4a1e28139de0ddc95c;p=redmine.git

Gemfile: pin pg version 0.17

On Rails 4.1.8, pg 0.18.0 cause error.

<pre>
  1) Failure:
WikiContentTest#test_update_with_gzipped_history [test/unit/wiki_content_test.rb:88]:
Expected: "gzip"
  Actual: ""
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13839 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 6a0000929..a18f95546 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ if File.exist?(database_file)
       when 'mysql'
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
       when /postgresql/
-        gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw, :x64_mingw]
+        gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw, :x64_mingw]
         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
       when /sqlite3/
         gem "sqlite3", :platforms => [:mri, :mingw, :x64_mingw]