After "git merge --no-ff sajith-3254.01-status-nevow-to-twisted-web"

gistfile1.txt

*   commit bd8bf0f91c1d608858b80858de0ac996c8ce838b
|\  Merge: 34e85ac51 225bb5854
| | Author: Sajith Sasidharan <sajith@hcoop.net>
| | Date:   Tue Apr 21 12:49:42 2020 -0400
| |
| |     Merge branch 'sajith-3254.01-status-nevow-to-twisted-web'
| |
| * commit 225bb5854a93e0ba8244346cda79b289c2f7d937
| | Author: Sajith Sasidharan <sajith@hcoop.net>
| | Date:   Tue Mar 24 17:36:15 2020 -0400
| |
| |     Add empty news fragment re. Statistics page rendering
| |
| * commit d844a8f89f50df391a8a6e217c0bc76f8e149cd5
| | Author: Sajith Sasidharan <sajith@hcoop.net>
| | Date:   Thu Apr 16 17:29:54 2020 -0400
| |
| |     Use twisted transparent tag to render data
| |
| |     This way the test suite will be happy, and we won't have extraneous
| |     `<div>` tags in the rendered page.
| |
| * commit a0eb00b2cc186be6c8c462e13348013ef109c350
| | Author: Sajith Sasidharan <sajith@hcoop.net>
| | Date:   Thu Apr 16 17:26:21 2020 -0400
| |
| |     Wrap renderer return values in tags
| |
| * commit 1e3ba25cc3a1f431bb041af5b433d61f02425ab0
| | Author: Sajith Sasidharan <sajith@hcoop.net>
| | Date:   Thu Apr 16 17:25:21 2020 -0400
| |
| |     Add some documentation to Statistics page
| |
| * commit 652b3f5bc016b765b865fae7428220e8e125bdd5
|/  Author: Sajith Sasidharan <sajith@hcoop.net>
|   Date:   Thu Apr 16 17:23:46 2020 -0400
|
|       Use twisted.web.template to render Statistics page
|
*   commit 34e85ac515ae023c36cc618ac29301b304a6c51a
|\  Merge: e8695f41a d30857739
| | Author: Jean-Paul Calderone <exarkun@users.noreply.github.com>
| | Date:   Fri Apr 17 14:06:48 2020 -0400
| |
| |     Merge pull request #707 from tahoe-lafs/3303.disable-eliot-test-suite
| |
| |     Disable Eliot test suite
| |
| * commit d308577397a1635ad49e22f16f7d0a760ae9453b
| | Author: Jean-Paul Calderone <exarkun@twistedmatrix.com>
| | Date:   Thu Apr 16 08:24:31 2020 -0400
| |
| |     Fixes: ticket:3303
| |
| * commit 30d0953bcf1585fb91f7df1b9742d4f8f35eaa18
| | Author: Jean-Paul Calderone <exarkun@twistedmatrix.com>
| | Date:   Thu Apr 16 08:24:15 2020 -0400
| |
| |     Disable the Eliot test suite
| |
* |   commit e8695f41a0972f04bdee58002790b84e398cd3f5
|\ \  Merge: 2136ef46a 4fc6840c1
| | | Author: Sajith Sasidharan <sajith@hcoop.net>
| | | Date:   Fri Apr 17 06:44:00 2020 -0400
| | |
| | |     Merge pull request #706 from sajith/3299.update-pypy
| | |
| | |     Use 2.7-buster Docker image for pypy