diff --git a/Gemfile b/Gemfile index 6b052ff82d..55166cf886 100644 --- a/Gemfile +++ b/Gemfile @@ -197,7 +197,7 @@ platforms :mri, :mingw do end group :postgres do - gem 'pg' + gem 'pg', "~> 0.17.1" end group :sqlite do diff --git a/Gemfile.lock b/Gemfile.lock index d3f7cf2665..844cdc0678 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,7 +191,7 @@ GEM paper_trail (2.7.2) activerecord (~> 3.0) railties (~> 3.0) - pg (0.15.1) + pg (0.17.1) polyglot (0.3.3) prototype-rails (3.2.1) rails (~> 3.2) @@ -390,7 +390,7 @@ DEPENDENCIES net-ldap (~> 0.2.2) object-daddy (~> 1.1.0) oj - pg + pg (~> 0.17.1) prototype-rails prototype_legacy_helper (= 0.0.0)! pry-byebug diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 98463fd3c3..0b008364ce 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -36,6 +36,7 @@ See doc/COPYRIGHT.rdoc for more details. * `#4090` 'Session Expires' setting breaks API * News subject contained in URL * Removes mocha mocking framework. +* Update pg-gem version ## 3.0.0pre44