aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-08-25 17:15:07 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2018-08-25 17:15:07 +0900
commit58fc1ff8efc68a1866fbb053fcd7dfb777f18d66 (patch)
tree2a47d6dec5f3d04ce8add1a44adeac9b9dd5c06f
parente2d8a2ccfd3b0d2030920346a2ff0cad93fcb188 (diff)
downloadrails-58fc1ff8efc68a1866fbb053fcd7dfb777f18d66.tar.gz
rails-58fc1ff8efc68a1866fbb053fcd7dfb777f18d66.tar.bz2
rails-58fc1ff8efc68a1866fbb053fcd7dfb777f18d66.zip
Avoid `pg` 1.1.0 for now
Because there are tests that fail due to the influence of the `async_exec` deprecate message. https://travis-ci.org/rails/rails/jobs/420345370 Related to #33188.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 86ff624e16..09f89804d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -123,7 +123,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
gem "sqlite3", "~> 1.3.6"
group :db do
- gem "pg", ">= 0.18.0"
+ gem "pg", ">= 0.18.0", "< 1.1"
gem "mysql2", ">= 0.4.10"
end
end
diff --git a/Gemfile.lock b/Gemfile.lock
index f353eea5cd..d727263c59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -540,7 +540,7 @@ DEPENDENCIES
minitest-bisect
mysql2 (>= 0.4.10)
nokogiri (>= 1.8.1)
- pg (>= 0.18.0)
+ pg (>= 0.18.0, < 1.1)
psych (~> 3.0)
puma
que
@@ -575,4 +575,4 @@ DEPENDENCIES
websocket-client-simple!
BUNDLED WITH
- 1.16.3
+ 1.16.4