diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 14397d2e..00000000 --- a/.mergify.yml +++ /dev/null @@ -1,13 +0,0 @@ -pull_request_rules: - - name: Automatic merge security PRs when all status checks pass - conditions: - - author~=^(dependabot\[bot\]|renovate\[bot\])$ - - status-success=unit-tests - - status-success=e2e-tests - actions: - merge: - method: rebase - rebase_fallback: squash - label: - add: - - mergify diff --git a/README.md b/README.md index f8b4c215..2a6617ff 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![GitHub Actions](https://github.com/NordicPlayground/thingy-rocks-dashboard-aws-js/actions/workflows/build-and-publish.yaml/badge.svg)](https://github.com/NordicPlayground/thingy-rocks-dashboard-aws-js/actions/workflows/build-and-publish.yaml) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Renovate](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com) -[![Mergify Status](https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/NordicPlayground/thingy-rocks-dashboard-aws-js)](https://mergify.io) [![@commitlint/config-conventional](https://img.shields.io/badge/%40commitlint-config--conventional-brightgreen )](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-conventional) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier/)