From 6c29d232e7e19d7e20014f0d8f766bca76cc0cc1 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Mon, 21 Sep 2020 11:57:53 +0200 Subject: [PATCH 1/3] Remove whitespaces in newlines --- .mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 56bfd522..90f55051 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,9 +11,9 @@ pull_request_rules: message: | Thanks for submitting this pull request. Bors-ng will now build test images. When it succeeds, we will continue to review and test your PR. - + bors try - + Note: if this build fails, [read this](http://mailu.io/master/contributors/environment.html#when-bors-try-fails). - name: 2 approved reviews; trigger bors r+ From 7e1150d9e593ce787b93e990a7ffb6c9cb5e4e45 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Mon, 21 Sep 2020 11:58:18 +0200 Subject: [PATCH 2/3] Sync mergify team-member list to actualy members --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 90f55051..98a60180 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -27,7 +27,7 @@ pull_request_rules: - name: Trusted author and 1 approved review; trigger bors r+ conditions: - - author~=^(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9|Nebukadneza|micw)$ + - author~=^(kaiyou|muhlemmer|mildred|HorayNarea|adi90x|hoellen|ofthesun9|Nebukadneza|micw|lub|Diman0)$ - -title~=(WIP|wip) - -label~=^(status/wip|status/blocked|review/need2)$ - "#approved-reviews-by>=1" From 957b6ac1045ec0916e3da288caa6830d25695b82 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Wed, 23 Sep 2020 15:18:23 +0200 Subject: [PATCH 3/3] Revert "Remove whitespaces in newlines" This reverts commit 6c29d232e7e19d7e20014f0d8f766bca76cc0cc1. --- .mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 98a60180..f2e5b860 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,9 +11,9 @@ pull_request_rules: message: | Thanks for submitting this pull request. Bors-ng will now build test images. When it succeeds, we will continue to review and test your PR. - + bors try - + Note: if this build fails, [read this](http://mailu.io/master/contributors/environment.html#when-bors-try-fails). - name: 2 approved reviews; trigger bors r+