Merge pull request #25055 from github/repo-sync

repo sync

.github/workflows/add-review-template.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin @3.1.0
 
       # Jump through some hoops to work with a multi-line file
       - name: Store review template in variable

.github/workflows/azure-preview-env-deploy.yml

@@ -94,7 +94,7 @@ jobs:
 
       - if: ${{ env.IS_INTERNAL_BUILD == 'true' }}
         name: Check out PR code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin @3.1.0
         with:
           ref: ${{ env.COMMIT_REF }}
           # To prevent issues with cloning early access content later

.github/workflows/enterprise-dates.yml

@@ -36,7 +36,7 @@ jobs:
           exit 1 # prevents further steps from running
 
       - name: Checkout repository code
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # pin @3.1.0
 
       - uses: ./.github/actions/node-npm-setup
 
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create pull request
         id: create-pull-request
-        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 # pin @v5.0.0
         env:
           # Disable pre-commit hooks; they don't play nicely here
           HUSKY: '0'

.github/workflows/update-graphql-files.yml

@@ -42,7 +42,7 @@ jobs:
           src/graphql/scripts/update-files.js
       - name: Create pull request
         id: create-pull-request
-        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5 # pin @v5.0.0
         env:
           # Disable pre-commit hooks; they don't play nicely here
           HUSKY: '0'

content/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/troubleshooting-your-migration-with-github-enterprise-importer.md

@@ -1,11 +1,11 @@
 ---
 title: Troubleshooting your migration with GitHub Enterprise Importer
 shortTitle: Troubleshoot migrations
-intro: 'If your migration fails or produces unexpected results, you can try common troubleshooting steps.'
+intro: "If your migration fails or produces unexpected results, you can try common troubleshooting steps."
 versions:
-  fpt: '*'
-  ghes: '*'
-  ghec: '*'
+  fpt: "*"
+  ghes: "*"
+  ghec: "*"
 redirect_from:
   - /early-access/github/migrating-with-github-enterprise-importer/running-a-migration-with-github-enterprise-importer/troubleshooting-your-migration-with-github-enterprise-importer
   - /early-access/enterprise-importer/completing-your-migration-with-github-enterprise-importer/troubleshooting-your-migration-with-github-enterprise-importer
@@ -25,8 +25,8 @@ Before you investigate further, try these troubleshooting steps that commonly re
 
 1. Verify that you're using the latest version of the {% data variables.product.prodname_cli %} extension you're using to migrate. If you're not, upgrade to the latest version.
 1. Verify that you meet all the access requirements. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/preparing-to-migrate-with-github-enterprise-importer/managing-access-for-github-enterprise-importer)."
-2. Try running the migration again. Some migrations issues are transient, and a second attempt may work.
-3. Try running a migration on a different repository with similar data. This will help determine whether the issue is unique to the repository or represents a broader data shape problem.
+1. Try running the migration again. Some migrations issues are transient, and a second attempt may work.
+1. Try running a migration on a different repository with similar data. This will help determine whether the issue is unique to the repository or represents a broader data shape problem.
 
 If these steps do not resolve your issue, review the migration logs for error messages. The log you need to check will depend on whether your migration failed or succeeded.
 
@@ -44,6 +44,7 @@ The log contains a record of each command you issued and all of the API requests
 - [`cipher name is not supported` error](#cipher-name-is-not-supported-error)
 - [`Subsystem 'sftp' could not be executed` error](#subsystem-sftp-could-not-be-executed-error)
 - [`Source export archive... does not exist` error](#source-export-archive-does-not-exist-error)
+- [`Repository rule violations found` error](#repository-rule-violations-found-error)
 
 ### Unable to run migrations
 
@@ -106,11 +107,17 @@ To resolve this issue, set the `--bbs-shared-home` argument for `gh bbs2gh migra
 You can identify the shared home directory in Bitbucket Server.
 
 1. Navigate to the Administration area of your Bitbucket Server or Data Center instance.
-1. In the sidebar, under "System," click "Storage." 
+1. In the sidebar, under "System," click "Storage."
 1. Under "Shared directory," view the location of your server's shared home directory.
 
 If you're running Bitbucket Data Center in cluster mode with multiple notes, your shared directory will be shared between cluster nodes and should be mounted in the same location on each node.
 
+### `Repository rule violations found` error
+
+If you receive a `Repository rule violations found` error, such as `GH013: Repository rule violations found for refs/heads/main`, data in the origin repository conflicts with rulesets (public beta) configured on the destination organization. For more information, see "[AUTOTITLE]({% ifversion repo-rules %}{% else %}/enterprise-cloud@latest{% endif %}/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets)."
+
+You can temporarily disable your rulesets during your migration, or you can use bypass mode or the bypass list to exempt your migration from configured rules. For more information, see "[AUTOTITLE]({% ifversion repo-rules-enterprise %}{% else %}/enterprise-cloud@latest{% endif %}/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization)."
+
 ## Troubleshooting successful migrations
 
 If your migration succeeds but produces unexpected results, review the migration log for error messages. For more information, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/completing-your-migration-with-github-enterprise-importer/accessing-your-migration-logs-for-github-enterprise-importer)."

content/organizations/managing-organization-settings/managing-rulesets-for-repositories-in-your-organization.md

@@ -19,6 +19,8 @@ When you create a ruleset for an organization, you use `fnmatch` syntax to defin
 
 {% data reusables.repositories.ruleset-bypass %}
 
+You can use the REST API to manage rulesets. For more information, see "[AUTOTITLE](/rest/orgs/rules)."
+
 If a repository is targeted by a ruleset created at organization level, only owners of the organization can edit this ruleset. However, people with admin access to the repository, or with a custom role including the "edit repository rules" permission, can create additional rulesets at the repository level. The rules in these rulesets will be aggregated with the rules defined at organization level. The result is that creating a new ruleset can make the rules targeting a branch or tag more restrictive, but never less restrictive. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets)."
 
 {% data reusables.repositories.rulesets-sudo-mode %}

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

@@ -14,6 +14,8 @@ shortTitle: Manage a ruleset
 
 You can create rulesets to control how users can interact with selected branches and tags in a repository. When you create a ruleset, you can allow certain users to bypass the rules in the ruleset. This can be users with certain permissions, specific teams, or {% data variables.product.prodname_github_apps %}. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/managing-rulesets/about-rulesets)."
 
+You can use the REST API to manage rulesets. For more information, see "[AUTOTITLE](/rest/repos/rules)".
+
 {% data reusables.repositories.rulesets-sudo-mode %}
 
 {% ifversion repo-rules-enterprise %}