Merge pull request #807 from opf/feature/update_pg_gem

updates pg gem version
pull/886/merge
Martin Linkhorst 11 years ago
commit 45e2af74c8
  1. 2
      Gemfile
  2. 4
      Gemfile.lock
  3. 1
      doc/CHANGELOG.md

@ -197,7 +197,7 @@ platforms :mri, :mingw do
end
group :postgres do
gem 'pg'
gem 'pg', "~> 0.17.1"
end
group :sqlite do

@ -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

@ -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

Loading…
Cancel
Save