tree b4f2e28578c58b5150299ca930e9be1e9cabc15f
parent 1a20152774b859a0cce26d5c2b2f688a54fac031
parent 9078129f78b7e1c900b9a614c44bd420ee300777
author David Pursehouse <dpursehouse@collab.net> 1579594680 +0900
committer David Pursehouse <dpursehouse@collab.net> 1579595224 +0900

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Switch off intraline diffs for some cases (invalid cache key sharing)
  Fix an internal server error when diffing patch sets (non-merge commit)
  Set HTTP thread name to describe the request it is processing

Change-Id: I2ec9d44bc7a9dd372e074a4030a7dd6b6d2ab657