Skip to content

add support for require conversation resolution#2374

Open
marcoieni wants to merge 1 commit intomainfrom
add-support-for-require-conversation-resolution
Open

add support for require conversation resolution#2374
marcoieni wants to merge 1 commit intomainfrom
add-support-for-require-conversation-resolution

Conversation

@marcoieni
Copy link
Copy Markdown
Member

@marcoieni marcoieni commented Apr 2, 2026

This setting was set manually from the UI. With this PR we add in team the ability to set this field via toml.

As you can see from the screenshots, all the repositories edited here have "require conversation resolution before merging" checked.
So we are just encoding this information in the toml files.

As you can see from the empty dry run, no changes will be done to GitHub. However if you check the last edit of the dry run (before I pushed the changes to the toml files), you can see that the dry run was correctly detecting these repos.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 2, 2026

Dry-run check results

[WARN  rust_team::sync] sync-team is running in dry mode, no changes will be applied.
[INFO  rust_team::sync] synchronizing crates-io
[INFO  rust_team::sync] synchronizing github

pub name: Option<String>,
pub dismiss_stale_review: bool,
#[serde(default)]
pub require_conversation_resolution: bool,
Copy link
Copy Markdown
Member Author

@marcoieni marcoieni Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In another PR, Kobzol said that adding new fields is not a breaking change for triagebot 👍

@marcoieni marcoieni force-pushed the add-support-for-require-conversation-resolution branch from 4919ee8 to 32302c0 Compare April 2, 2026 16:48
@marcoieni marcoieni force-pushed the add-support-for-require-conversation-resolution branch from 32302c0 to dac0a38 Compare April 2, 2026 17:07
@marcoieni
Copy link
Copy Markdown
Member Author

Branch protections screenshots

001-github-com-rust-lang-blog-rust-lang-org-settings-branch-protection-rules-6811234 002-github-com-rust-lang-docs-rs-settings-branch-protection-rules-70108634 003-github-com-rust-lang-promote-release-settings-branch-protection-rules-26750749 004-github-com-rust-lang-relnotes-settings-branch-protection-rules-28495006 005-github-com-rust-lang-thorin-settings-branch-protection-rules-23222430

@marcoieni marcoieni marked this pull request as ready for review April 2, 2026 17:14
@rustbot
Copy link
Copy Markdown

rustbot commented Apr 2, 2026

rust_team_data/src/v1.rs has been modified, it is used (as a git dependency) by multiple sub-projects like triagebot, the www.rust-lang.org website and others.

If you are changing the data structures, please make sure that the changes are not going to break serde deserialization (adding a field is fine; removing or renaming a field isn't).

If you must do a breaking change to the format, make sure to coordinate it with all the users of the rust_team_data crate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants