diff --git a/Gemfile b/Gemfile index 5e94baed6..76a25198c 100644 --- a/Gemfile +++ b/Gemfile @@ -107,7 +107,8 @@ gem 'omniauth-oauth2', require: false gem 'omniauth-browserid', git: 'https://github.com/callahad/omniauth-browserid.git', branch: 'observer_api' gem 'omniauth-cas' gem 'oj' -gem 'pg' +# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4 +gem 'pg', '0.15.1' gem 'rake' diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 7f7100dd1..9a630f1e7 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -271,7 +271,7 @@ GEM openid-redis-store (0.0.2) redis ruby-openid - pg (0.17.0) + pg (0.15.1) polyglot (0.3.3) progress (3.0.0) pry (0.9.12.4) @@ -491,7 +491,7 @@ DEPENDENCIES omniauth-openid omniauth-twitter openid-redis-store - pg + pg (= 0.15.1) pry-nav pry-rails puma