From b4a9e9dc6ba619d02527761601bfe8b3e211366f Mon Sep 17 00:00:00 2001 From: Ulises Gascon Date: Fri, 2 Feb 2024 17:40:45 +0100 Subject: [PATCH 1/2] docs: add OSSF Scorecard badge --- Readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Readme.md b/Readme.md index d0f3cf56e6..7fee21edd4 100644 --- a/Readme.md +++ b/Readme.md @@ -5,6 +5,7 @@ [![NPM Version][npm-version-image]][npm-url] [![NPM Install Size][npm-install-size-image]][npm-install-size-url] [![NPM Downloads][npm-downloads-image]][npm-downloads-url] + [![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer] ```js const express = require('express') @@ -164,3 +165,5 @@ The current lead maintainer is [Douglas Christopher Wilson](https://github.com/d [npm-install-size-url]: https://packagephobia.com/result?p=express [npm-url]: https://npmjs.org/package/express [npm-version-image]: https://badgen.net/npm/v/express +[ossf-scorecard-badge]: https://api.securityscorecards.dev/projects/github.com/expressjs/express/badge +[ossf-scorecard-visualizer]: https://kooltheba.github.io/openssf-scorecard-api-visualizer/#/projects/github.com/expressjs/express From 4d8aa0692bd21c1ee292d66ee7a708da36d7442f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Thu, 6 Jun 2024 11:37:22 +0200 Subject: [PATCH 2/2] docs: solve merge conflict error --- Readme.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/Readme.md b/Readme.md index d992264e7d..261f179ea1 100644 --- a/Readme.md +++ b/Readme.md @@ -2,12 +2,6 @@ **Fast, unopinionated, minimalist web framework for [Node.js](http://nodejs.org).** -<<<<<<< docs/add-scorecard-badge - [![NPM Version][npm-version-image]][npm-url] - [![NPM Install Size][npm-install-size-image]][npm-install-size-url] - [![NPM Downloads][npm-downloads-image]][npm-downloads-url] - [![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer] -======= **This project has a [Code of Conduct][].** ## Table of contents @@ -28,7 +22,8 @@ [![NPM Version][npm-version-image]][npm-url] [![NPM Install Size][npm-install-size-image]][npm-install-size-url] [![NPM Downloads][npm-downloads-image]][npm-downloads-url] ->>>>>>> master +[![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer] + ```js const express = require('express') @@ -260,9 +255,6 @@ The current lead maintainer is [Douglas Christopher Wilson](https://github.com/d [npm-install-size-url]: https://packagephobia.com/result?p=express [npm-url]: https://npmjs.org/package/express [npm-version-image]: https://badgen.net/npm/v/express -<<<<<<< docs/add-scorecard-badge [ossf-scorecard-badge]: https://api.securityscorecards.dev/projects/github.com/expressjs/express/badge [ossf-scorecard-visualizer]: https://kooltheba.github.io/openssf-scorecard-api-visualizer/#/projects/github.com/expressjs/express -======= [Code of Conduct]: https://github.com/expressjs/express/blob/master/Code-Of-Conduct.md ->>>>>>> master