diff options
author | Lars Kanis <lars@greiz-reinsdorf.de> | 2018-01-10 20:40:08 +0100 |
---|---|---|
committer | Lars Kanis <lars@greiz-reinsdorf.de> | 2018-01-10 21:55:43 +0100 |
commit | f820dc2dea3775f6c05c5ca77631ac27a9d3c954 (patch) | |
tree | eeb4b4fd66b8a489ffe7a1afbedf9c285e651337 /actioncable/lib/action_cable | |
parent | 96f59306101a6ee252df2a9636ef2569d26924f7 (diff) | |
download | rails-f820dc2dea3775f6c05c5ca77631ac27a9d3c954.tar.gz rails-f820dc2dea3775f6c05c5ca77631ac27a9d3c954.tar.bz2 rails-f820dc2dea3775f6c05c5ca77631ac27a9d3c954.zip |
PostgreSQL: Allow pg-1.0 gem to be used with ActiveRecord
pg-1.0.0 is just released and most Gemfiles don't restrict
it's version. But the version is checked when connecting to
the database, which leads to the following error:
Gem::LoadError: can't activate pg (~> 0.18), already activated pg-1.0.0
See also this pg issue:
https://bitbucket.org/ged/ruby-pg/issues/270/pg-100-x64-mingw32-rails-server-not-start
Preparation for pg-1.0 was done in commit f28a331023fab,
but the pg version constraint was not yet relaxed.
Diffstat (limited to 'actioncable/lib/action_cable')
-rw-r--r-- | actioncable/lib/action_cable/subscription_adapter/postgresql.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/postgresql.rb b/actioncable/lib/action_cable/subscription_adapter/postgresql.rb index a9c0949950..e384ea4afb 100644 --- a/actioncable/lib/action_cable/subscription_adapter/postgresql.rb +++ b/actioncable/lib/action_cable/subscription_adapter/postgresql.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -gem "pg", "~> 0.18" +gem "pg", ">= 0.18", "< 2.0" require "pg" require "thread" require "digest/sha1" |