Merge pull request github#39895 from github/repo-sync

Repo sync

Author: docs-bot

content/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/available-rules-for-rulesets.md

@@ -238,7 +238,7 @@ Metadata restrictions block "ref updates." If a contributor pushes work that inc
 
 Metadata restrictions can increase friction for people contributing to a repository. Generally, if you impose metadata restrictions, you should do so on a limited set of branches to avoid impacting contributors' daily work. For example, instead of requiring consistent commit messages on any topic branch that a contributor might work on, you should require consistent commit messages on `main` only, then require pull requests into `main`.
 
-If you use squash merges, you should be aware that metadata restrictions are evaluated before the merge, so all commits on the pull request must meet the requirements. For metadata restrictions that apply to committer emails, the pattern must also include `[email protected]` for squash merges to satisfy the restriction.
+If you use squash merges, the individual commits in the pull request are ignored. Instead, restrictions are only validated against the metadata of the single, resulting merge commit. The pull request page validates this information before the merge is allowed, ensuring the final commit is compliant. For metadata restrictions that apply to committer emails, the pattern must also include `[email protected]` for squash merges to satisfy the restriction.
 
 When you add metadata restrictions to an existing branch or tag, the rules are enforced for new commits pushed to the branch or tag from that point forward, but they are not enforced against the existing history of the branch or tag.
 

data/reusables/copilot/differences-cfi-cfb-table.md

@@ -65,7 +65,7 @@
 | Private extensions | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | Coding guidelines for code review | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} |
 | Block suggestions matching public code | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
-| Exclude specified files from {% data variables.product.prodname_copilot_short %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
+| Exclude specified files from {% data variables.product.prodname_copilot_short %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 | Organization-wide policy management         | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "x" aria-label="Not included" %} | {% octicon "check" aria-label="Included" %} | {% octicon "check" aria-label="Included" %} |
 
 {% endrowheaders %}

ownership.yaml

@@ -7,7 +7,7 @@ ownership:
     kind: moda
     long_name: Docs on Moda
     description: Please use <https://catalog.githubapp.com/services/docs> instead.
-    exec_sponsor: nerdneha
+    exec_sponsor: ahalliop
     product_manager: docs-bot
     maintainer: anjuan
     team_slack: docs

package-lock.json

@@ -255,7 +255,7 @@
     "@primer/behaviors": "^1.7.2",
     "@primer/css": "^21.3.1",
     "@primer/live-region-element": "^0.7.2",
-    "@primer/octicons": "^19.14.0",
+    "@primer/octicons": "^19.15.5",
     "@primer/octicons-react": "^19.14.0",
     "@primer/react": "36.27.0",
     "accept-language-parser": "^1.5.0",

package.json

@@ -106,3 +106,7 @@
 - is: https://papers.ssrn.com/sol3/papers.cfm?abstract_id=1375604
 - is: https://developers.redhat.com/articles/2025/02/17/how-securely-deploy-github-arc-openshift#arc_architecture
 - startsWith: https://creativecommons.org/
+- is: https://www.adobe.com/privacy/policy.html
+- is: https://www.facebook.com/policies/cookies/
+- is: https://help.fullstory.com/hc/en-us/articles/360020623394-GDPR-FAQs
+- is: https://collectd.org/documentation/manpages/collectd.conf.html#plugin-fhcount