about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2023-09-21 07:49:38 +0200
committerRalf Jung <post@ralfj.de>2023-09-21 07:49:38 +0200
commita11b1d8b26f99b256b9e14cf540d8c457d6c83fe (patch)
treeb9fd5c85bfd62494160240f2ae16729bad205c9f
parent59105177cc974182c61485e6695498f9c712c5d7 (diff)
downloadrust-a11b1d8b26f99b256b9e14cf540d8c457d6c83fe.tar.gz
rust-a11b1d8b26f99b256b9e14cf540d8c457d6c83fe.zip
disable no-merges check for now
-rw-r--r--src/tools/miri/triagebot.toml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/miri/triagebot.toml b/src/tools/miri/triagebot.toml
index 8d00cedb769..1c520a9c779 100644
--- a/src/tools/miri/triagebot.toml
+++ b/src/tools/miri/triagebot.toml
@@ -10,5 +10,6 @@ allow-unauthenticated = [
 # Gives us the commands 'ready', 'author', 'blocked'
 [shortcut]
 
-[no-merges]
-exclude_titles = ["Rollup of", "sync from rustc"]
+# disabled until https://github.com/rust-lang/triagebot/pull/1720 lands
+#[no-merges]
+#exclude_titles = ["Rollup of", "sync from rustc"]