Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/triagebot/merge-conflicts.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ This feature is enabled on a repository by having a `[merge-conflicts]` table in

There are several optional keys that you can include:

- `consider-prs-from-bots` --- Should merge conflicts be reported for PR opened by bots.
- `remove` --- A list of labels to remove from the PR when a conflict is detected.
- `add` --- A list of labels to add to the PR when a conflict is detected.
- `unless` --- A list of labels that, if already present on the PR, will prevent triagebot from adding or removing labels.
Expand All @@ -28,6 +29,7 @@ There are several optional keys that you can include:

```toml
[merge-conflicts]
consider-prs-from-bots = true
remove = ['S-waiting-on-bors']
add = ['S-waiting-on-author']
unless = ['S-blocked', 'S-waiting-on-crater', 'S-waiting-on-team', 'S-waiting-on-review']
Expand Down
4 changes: 4 additions & 0 deletions src/triagebot/range-diff.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ This feature is enabled on a repository by having a empty `[range-diff]` table i
[range-diff]
```

There are optional keys that you can include:

- `consider-push-from-bots` (default: `false`) --- Should push from bots be consider for a range-diff comment.

## Implementation

See [`src/handlers/check_commits/range_diff.rs`](https://github.com/rust-lang/triagebot/blob/HEAD/src/handlers/check_commits/force_push_range_diff.rs).
5 changes: 5 additions & 0 deletions src/triagebot/zulip-notifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ zulip_stream = 245100 # #t-compiler/prioritization/alerts
# {title} is replaced with the issue/PR title.
topic = "#{number} {title}"

# Optional message to be posted on GitHub when opening the Zulip topic.
# Useful to add a backlink from GitHub to the Zulip topic.
# Supports {zulip_topic_url} substitution.
github_comment = "[Zulip topic]({zulip_topic_url}) was opened to discuss this issue."

# The message to post when the label is added.
# Supports {number} and {title} substitution.
message_on_add = "Issue #{number} \"{title}\" has been added."
Expand Down