about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-26 08:33:18 +0000
committerbors <bors@rust-lang.org>2023-07-26 08:33:18 +0000
commit80641c0ca252cc12ba3a056477dd1c96ef7f85fa (patch)
tree5d2d7f9ba1450762d36580c5b89cc9d95e923f97
parent0d0dbae5508e9841832498e7c915c89234a0f048 (diff)
parent5976fda20d2e00980bc3be657a68f53594e69c90 (diff)
downloadrust-80641c0ca252cc12ba3a056477dd1c96ef7f85fa.tar.gz
rust-80641c0ca252cc12ba3a056477dd1c96ef7f85fa.zip
Auto merge of #11231 - xFrednet:00000-merge-no-merge, r=flip1995
Add *no merge policy* note via rustbot

I just found out that ``@rustbot`` can automatically add a note about our *no-merge commits* policy, if it detects a merge commit: https://forge.rust-lang.org/triagebot/no-merge.html

Funnly enough, I found this while writing documentation for Marker. ``@rustbot`` is a cool tool :+1:

---

r? `@flip1995` since you'll probably be the person that will see this message the most ^^

changelog: none
-rw-r--r--triagebot.toml3
1 files changed, 3 insertions, 0 deletions
diff --git a/triagebot.toml b/triagebot.toml
index d94fdc2862f..6856bb0ab37 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -9,6 +9,9 @@ allow-unauthenticated = [
 # See https://github.com/rust-lang/triagebot/wiki/Shortcuts
 [shortcut]
 
+# Have rustbot inform users about the *No Merge Policy*
+[no-merges]
+
 [autolabel."S-waiting-on-review"]
 new_pr = true