Merge branch 'master' into glitch-soc/merge-upstream

2018-11-09 14:56:31 +01:00
parent a2a254625b ed7c5f94f7
commit 9201398507
26 changed files with 191 additions and 97 deletions
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -94,7 +94,7 @@ class Request
  end

  def timeout
-    { write: 10, connect: 10, read: 10 }
+    { connect: 1, read: 10, write: 10 }
  end

  def http_client