diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-01-09 09:24:08 +0000 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-01-09 09:24:08 +0000 |
| commit | b9d5a77246762de56f39d4476c881c1b667e7a20 (patch) | |
| tree | 74b2d7c60b98f7cbfcda096297ee4de977a80281 | |
| parent | 3589ad89d11476f82caa93e8cd55aabe85299462 (diff) | |
| parent | 7fabc8921705f090ff52adf34c06ac9b0e448ccc (diff) | |
Merge branch 'gem_updates' into rails-3-develop
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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..189a6478b 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) @@ -204,7 +204,7 @@ GEM rbx-require-relative (0.0.9) rdoc (3.12.2) json (~> 1.4) - recaptcha (0.3.5) + recaptcha (0.3.6) ref (1.0.5) rest-client (1.6.7) mime-types (>= 1.16) @@ -323,7 +323,7 @@ DEPENDENCIES net-purge newrelic_rpm nokogiri - pg + pg (~> 0.17.1) quiet_assets rack rails (= 3.2.21) |