Merge next into beta (#2007)

CONTRIBUTORS.md

@@ -315,7 +315,6 @@ Gio d'Amelio @giodamelio https://github.com/giodamelio
 Girish Ramakrishnan @gramakri https://github.com/gramakri
 Golo Roden @goloroden https://github.com/goloroden
 Goran Gajic @gorangajic https://github.com/gorangajic
-Greenkeeper @greenkeeperio-bot https://github.com/greenkeeperio-bot
 Greg Leppert @leppert https://github.com/leppert
 Gregor Martynus @gr2m https://github.com/gr2m
 Gregory Cowan @KrekkieD https://github.com/KrekkieD
@@ -903,7 +902,6 @@ narendra @reddynr https://github.com/reddynr
 @galenus https://github.com/galenus
 @getlittletech https://github.com/getlittletech
 @gmatroskin https://github.com/gmatroskin
-@greenkeeper null
 @handane123 https://github.com/handane123
 @hellboy81 https://github.com/hellboy81
 @hermano360 https://github.com/hermano360

README.md

@@ -3,7 +3,7 @@
 [![npm](https://img.shields.io/npm/v/nock.svg)][npmjs]
 [![Build Status](https://travis-ci.org/nock/nock.svg)][build]
 ![Coverage Status](http://img.shields.io/badge/coverage-100%25-brightgreen.svg)
-[![Greenkeeper](https://badges.greenkeeper.io/nock/nock.svg)](https://greenkeeper.io/)
+![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=nock/nock)
 [![Backers on Open Collective](https://opencollective.com/nock/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/nock/sponsors/badge.svg)](#sponsors)
 
@@ -1388,7 +1388,7 @@ nockBack('zomboFixture.json', nockDone => {
 
 If your tests are using promises then use `nockBack` like this:
 
-```
+```js
 return nockBack('promisedFixture.json')
   .then(({ nockDone, context }) => {
     //  do your tests returning a promise and chain it with
@@ -1461,14 +1461,14 @@ The same is true for `.replyWithError()`.
 
 Adding `{ retry: 0 }` to the `got` invocations will disable retrying, e.g.:
 
-```
-await got("http://example.test/", { retry: 0 })
+```js
+await got('http://example.test/', { retry: 0 })
 ```
 
 If you need to do this in all your tests, you can create a module
 `got_client.js` which exports a custom got instance:
 
-```
+```js
 const got = require('got')
 
 module.exports = got.extend({ retry: 0 })

package.json

@@ -45,7 +45,7 @@
     "mocha": "^7.0.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.0.2",
+    "prettier": "2.0.5",
     "proxyquire": "^2.1.0",
     "request": "^2.83.0",
     "rimraf": "^3.0.0",