aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-01-06 10:49:18 +0000
committerGareth Rees <gareth@mysociety.org>2015-01-06 10:49:18 +0000
commit725639b7c28605c557791072e2321ddd543191b7 (patch)
treeb16d7cfc0a452be66908cb7944446ce046d5a536
parent76950510e850d7f09af9710d86bd94c815fd7759 (diff)
Update and lock pg gem
- Updates pg to the latest version with 1.8.7 support - Add version specifier
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f5bb0ef97..008763db1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem 'rails', '3.2.21'
-gem 'pg'
+gem 'pg', '~> 0.17.1'
# New gem releases aren't being done. master is newer and supports Rails > 3.0
gem 'acts_as_versioned', :git => 'git://github.com/technoweenie/acts_as_versioned.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3e640ad77..69aaa1f48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -170,7 +170,7 @@ GEM
paper_trail (2.7.2)
activerecord (~> 3.0)
railties (~> 3.0)
- pg (0.15.1)
+ pg (0.17.1)
polyglot (0.3.5)
quiet_assets (1.0.2)
railties (>= 3.1, < 5.0)
@@ -323,7 +323,7 @@ DEPENDENCIES
net-purge
newrelic_rpm
nokogiri
- pg
+ pg (~> 0.17.1)
quiet_assets
rack
rails (= 3.2.21)