summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-05-05 15:59:43 +0200
committerGitHub <noreply@github.com>2021-05-05 15:59:43 +0200
commitdfa002932d660656792a78887264dd00820f2dda (patch)
tree5c642a4dc37657de1bda114936cf5cfdf1c167c4
parent25345c90ffb74a8231eae4a130c98b6eaad7ce36 (diff)
Workaround Resolv::DNS-induced hangs by installing resolv 0.1.0 (#16157)
See https://github.com/tootsuite/mastodon/pull/16154#issuecomment-832062139
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
2 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 0cb5c6a0e2e..fb80e24d5c2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -157,3 +157,5 @@ gem 'concurrent-ruby', require: false
gem 'connection_pool', require: false
gem 'xorcist', '~> 1.1'
+
+gem 'resolv', '~> 0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index cae58b5e0ba..3c36e07bc17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -498,6 +498,7 @@ GEM
regexp_parser (2.1.1)
request_store (1.5.0)
rack (>= 1.4)
+ resolv (0.1.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
@@ -773,6 +774,7 @@ DEPENDENCIES
rdf-normalize (~> 0.4)
redis (~> 4.2)
redis-namespace (~> 1.8)
+ resolv (~> 0.1.0)
rqrcode (~> 1.2)
rspec-rails (~> 5.0)
rspec-sidekiq (~> 3.1)