From 288b560f92e299d80f62ee1acd220c584720da90 Mon Sep 17 00:00:00 2001 From: Kai Szuttor <2150555+KaiSzuttor@users.noreply.github.com> Date: Tue, 24 Dec 2019 13:28:10 +0100 Subject: [PATCH] Revert "Replace kodiak by bors" --- .kodiak.toml | 9 +++++++++ bors.toml | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .kodiak.toml delete mode 100644 bors.toml diff --git a/.kodiak.toml b/.kodiak.toml new file mode 100644 index 0000000000..b623456b02 --- /dev/null +++ b/.kodiak.toml @@ -0,0 +1,9 @@ +version = 1 + +[merge] +method = "merge" + +[merge.message] +title = "pull_request_title" +body = "pull_request_body" +include_pr_number = true diff --git a/bors.toml b/bors.toml deleted file mode 100644 index 0a7b3c0352..0000000000 --- a/bors.toml +++ /dev/null @@ -1,5 +0,0 @@ -status = [ - "ICP GitLab CI" -] -timeout_sec = 14400 -required_approvals = 1