Merge branch 'main' into loc-file-counts

Author: MaedahBatool

docs/admin/config/batch_changes.mdx

@@ -370,3 +370,42 @@ batchSpecLibrary(first: 100) {
   }
 }
 ```
+
+### Featured Templates
+
+<Callout type="note">Featured templates are supported in Sourcegraph v6.4 and more.</Callout>
+
+Site-admins can mark a template as featured by either clicking the star button next to the list of library records. Featured records will automatically move to a section atop the remaining library records.
+
+### Labels
+
+<Callout type="note">Labels are supported in Sourcegraph v6.4 and more.</Callout>
+
+Batch Spec Library records support an optional `labels` field for categorization and filtering. Common labels include:
+
+- `"featured"` - Marks popular or recommended batch specs that are displayed in a "Featured Templates" section above the remaining examples
+- Custom labels for organizational categorization (not exposed to Batch Changes users yet)
+
+To remove the featured status, you can update the library record with an empty list of labels (`[]`).
+
+```graphql
+createBatchSpecLibraryRecord(name: "example", spec: "version: 2\nname: example", labels: ["featured"]) {
+  id
+  labels
+}
+
+updateBatchSpecLibraryRecord(id: "QmF0Y2hTcGVjTGlicmFyeVJlY29yZDo4", name: "example-2", spec: "version: 2\nname: example-2", labels: ["featured"]) {
+  id
+  labels
+}
+
+# Query only featured batch specs
+batchSpecLibrary(first: 100, labels: ["featured"]) {
+  nodes {
+    id
+    name
+    labels
+    spec
+  }
+}
+```

docs/batch-changes/bulk-operations-on-changesets.mdx

@@ -33,11 +33,12 @@ Below is a list of supported bulk operations for changesets and the conditions w
 | **Commenting**           | Post a comment on all selected changesets. Useful for pinging people, reminding them to take a look at the changeset, or posting your favorite emoji                                                                                                                                                                                                                                                     |
 | **Detach**               | Detach a selection of changesets from the batch change to remove them from the archived tab                                                                                                                                                                                                                                                                                                              |
 | **Re-enqueue**           | Re-enqueues the pending changes for all selected changesets that failed                                                                                                                                                                                                                                                                                                                                  |
-| **Merge (experimental)** | Merge the selected changesets on code hosts. Some changesets may be unmergeable due to their states, which does not impact the overall bulk operation. Failed merges are listed under the bulk operations tab. In the confirmation modal, you can opt for a squash merge strategy, available on GitHub, GitLab, and Bitbucket Cloud. For Bitbucket Server/Data Center, only regular merges are performed |
+| **Merge** | Merge the selected changesets on code hosts. Some changesets may be unmergeable due to their states, which does not impact the overall bulk operation. Failed merges are listed under the bulk operations tab. In the confirmation modal, you can opt for a squash merge strategy, available on GitHub, GitLab, and Bitbucket Cloud. For Bitbucket Server/Data Center, only regular merges are performed |
 | **Close**                | Close the selected changesets on the code hosts                                                                                                                                                                                                                                                                                                                                                          |
 | **Publish**              | Publishes the selected changesets, provided they don't have a [`published` field](/batch-changes/batch-spec-yaml-reference#changesettemplatepublished) in the batch spec. You can choose between draft and normal changesets in the confirmation modal                                                                                                                                       |
 | **Export**              |  Export selected changesets that you can use for later use                                                                                                                                       |
 | **Re-execute**              |  Users can re-execute individual changeset creation logic for selected workspaces. This allows for creating new changesets for users who are using non-deterministic run steps (for example,LLMs)                                                                                                                                       |
+| **Enable auto-merge for GitHub (experimental)** | Enable auto-merge on selected GitHub changesets. When enabled, changesets will be automatically merged once all required status checks pass and any blocking reviews are resolved. This feature is GitHub-specific and requires [appropriate setup](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository) on the target repositories. Failed actions are listed under the bulk operations tab. |
 
 ## Monitoring bulk operations