Bug/issue 842

[madkoo]

Fixes #842

This pull request introduces several updates to branch protection logic, repository/org-level settings application, and the configuration schema for repository and organization settings. The main changes improve compatibility with GitHub's API requirements, enhance the schema to support new security and review features, and refine documentation for clarity and deprecation notices.

Branch Protection Logic and Settings Application:

• Ensured required fields (required_status_checks, enforce_admins, restrictions) are always included when updating branch protection to comply with GitHub API requirements. [1] [2] [3]
• Changed settings application order so organization-level settings (e.g., rulesets) are applied before repository-level settings, matching the behavior of full sync operations.

Schema Enhancements for Security and Reviews:

• Added support for new security-related settings in the schema: code_security and secret_scanning_ai_detection, each with a status property. [1] [2]
• Introduced the required_reviewers beta feature in branch protection rules, allowing configuration of required reviewing teams and file patterns.
• Added allowed_merge_methods to specify which merge methods are permitted in branch protection parameters.

Schema Documentation and Deprecation Updates:

• Updated descriptions for several fields to clarify deprecation or "closing down" status, including use_squash_pr_title_as_default, permission, and contexts. [1] [2] [3]
• Improved and clarified documentation for schema properties, including maintainers, rule condition descriptions, and rule naming. [1] [2] [3] [4]

Ruleset and Branch Protection Schema Adjustments:

• Added support for a new repository value in ruleset target enum and clarified conditions for repository policy rulesets. [1] [2]
• Enhanced bypass actor configuration: clarified actor_id requirements, expanded bypass_mode options to include exempt, and updated related descriptions. [1] [2]

Removal of Deprecated Schema Features:

• Removed the merge_queue rule from the schema, reflecting its deprecation or lack of support.

[Copilot]

Pull request overview

Updates Safe-Settings’ branch protection/ruleset handling and the settings schema to align with newer GitHub API expectations and newly supported configuration options.

Changes:

• Ensures updateBranchProtection requests always include GitHub-required top-level keys.
• Applies org-level settings (rulesets) before repo-level settings in selected-repo syncs.
• Extends the JSON schema with new security/review/ruleset options and documentation updates (including removing deprecated merge_queue rule).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 5 comments.

File	Description
schema/dereferenced/settings.json	Adds/updates schema fields for security settings, PR review/ruleset features, and clarifies/deprecates documentation.
lib/settings.js	Changes sync order so org-level settings are applied first in syncSelectedRepos.
lib/plugins/branches.js	Adds required branch protection fields into update payloads to satisfy GitHub API requirements.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[Copilot]

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

schema/dereferenced/settings.json:1184

• minimum_approvals is an integer but currently permits negative values. Since the description implies a lower bound of 0 (and aligns with other review-count fields in this schema), add minimum: 0 (and any appropriate maximum) to prevent invalid configurations.

                              "minimum_approvals": {
                                "type": "integer",
                                "description": "Minimum number of approvals required from the specified team. If set to zero, the team will be added to the pull request but approval is optional."
                              },

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.