Skip to content

Commit 95856cd

Browse files
authored
Merge pull request #44320 from github/repo-sync
Repo sync
2 parents ecb3e3d + abe377a commit 95856cd

11 files changed

Lines changed: 89 additions & 43 deletions

File tree

.github/workflows/sync-secret-scanning.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,27 @@ jobs:
7272
--title "Sync secret scanning data" \
7373
--body '👋 humans. This PR updates the secret scanning data with the latest changes from github/token-scanning-service.
7474
75-
/cc @github/docs-content-security-products
75+
If CI passes, this PR will be auto-merged. :green_heart:
7676
7777
If CI does not pass or other problems arise, contact #docs-engineering on Slack.' \
7878
--repo github/docs-internal \
79-
--label secret-scanning-pipeline,'skip FR board',ready-for-doc-review,workflow-generated \
79+
--label secret-scanning-pipeline,'skip FR board',workflow-generated \
8080
--head=$branchname
8181
82+
# can't approve your own PR, approve with Actions
83+
echo "Approving pull request..."
84+
unset GITHUB_TOKEN
85+
gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"
86+
gh pr review --approve
87+
echo "Approved pull request"
88+
89+
# Actions can't merge the PR so back to docs-bot to merge
90+
echo "Setting pull request to auto merge..."
91+
unset GITHUB_TOKEN
92+
gh auth login --with-token <<< "${{ secrets.DOCS_BOT_PAT_BASE }}"
93+
gh pr merge --auto --merge
94+
echo "Set pull request to auto merge"
95+
8296
- uses: ./.github/actions/slack-alert
8397
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
8498
with:
333 KB
Loading

content/billing/how-tos/products/manage-ghas-licenses.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ For information about using policies to control use of licenses in your enterpri
4040
1. To the right of "{% data variables.product.prodname_AS %}", select {% octicon "kebab-horizontal" aria-label="Open menu" %}, then click **Cancel subscription**.
4141
1. To confirm your cancellation, click **I understand, cancel {% data variables.product.prodname_AS %}**.
4242

43-
{% ifversion disable-ghas-button %}
44-
4543
## Disabling {% data variables.product.prodname_GHAS %} in an enterprise
4644

4745
Enterprise owners can disable {% data variables.product.prodname_GHAS %} completely and set a policy to prevent future re-enablement. See [AUTOTITLE](/billing/how-tos/products/disable-ghas-for-enterprise).
48-
49-
{% endif %}

content/code-security/concepts/code-scanning/about-code-scanning-alerts.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ If you configure {% data variables.product.prodname_code_scanning %} using {% da
6464

6565
When {% data variables.product.prodname_code_scanning %} reports data-flow alerts, {% data variables.product.prodname_dotcom %} shows you how data moves through the code. {% data variables.product.prodname_code_scanning_caps %} allows you to identify the areas of your code that leak sensitive information, and that could be the entry point for attacks by malicious users.
6666

67+
In some cases, the same vulnerability can be reached through multiple code paths, for example, when several different functions pass user input to the same unsafe operation. {% data variables.product.prodname_code_scanning_caps %} groups these related paths under a single alert rather than creating separate alerts for each path, so you can see the full scope of the vulnerability in one place.
68+
6769
{% data reusables.code-scanning.track-alert-in-issue %}
6870

6971
### About alerts from multiple configurations

content/code-security/how-tos/manage-security-alerts/manage-code-scanning-alerts/assessing-code-scanning-alerts-for-your-repository.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@ By default, the {% data variables.product.prodname_code_scanning %} alerts page
3131

3232
{% data reusables.code-scanning.explore-alert %}
3333
{% data reusables.code-scanning.alert-default-branch %}
34-
1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used.
34+
1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used. The path view shows each step in the data flow as a numbered list, from the point where user-provided data enters the code (the source) to the point where it's used in a potentially unsafe operation (the sink).
3535

3636
![Screenshot of a {% data variables.product.prodname_code_scanning %} alert. The "Show paths" and "Show more" links are outlined in dark orange.](/assets/images/help/repository/code-scanning-alert-details.png)
3737

38+
Some alerts identify multiple paths through the code that could trigger the same vulnerability. When an alert has multiple paths, a dropdown appears above the path view showing the number of paths available. You can select each path from the dropdown to review it individually.
39+
40+
![Screenshot of a {% data variables.product.prodname_code_scanning %} alert detail page showing the paths dropdown with "3 paths available".](/assets/images/help/repository/multiple-paths-available.png)
41+
3842
1. Alerts from {% data variables.product.prodname_codeql %} analysis include a description of the problem. Click **Show more** for guidance on how to fix your code.
3943
{% data reusables.security.alert-assignee-step %}
4044

content/code-security/reference/supply-chain-security/dependabot-options-reference.md

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -218,42 +218,58 @@ You can specify the duration of the cooldown using the options below.
218218
| `include` | List of dependencies to **apply cooldown** (up to **150 items**). Supports wildcards (`*`). |
219219
| `exclude` | List of dependencies **excluded from cooldown** (up to **150 items**). Supports wildcards (`*`). |
220220

221-
The table below shows the package managers for which SemVer is supported.
221+
The table below shows the package managers that support `cooldown`. The `default-days` option is supported for all package managers listed, while `semver-major-days`, `semver-minor-days`, and `semver-patch-days` are supported only where indicated.
222222

223-
| Package manager | SemVer supported |
224-
|-----------------------|------------------|
223+
| Package manager | Default days supported | SemVer-bump days supported |
224+
|-----------------------|:----------------------:|:--------------------------:|
225225
| {% ifversion dependabot-bazel-support %} |
226-
| Bazel | {% octicon "x" aria-label="Not supported" %} |
226+
| Bazel | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
227227
| {% endif %} |
228-
| Bundler | {% octicon "check" aria-label="Supported" %} |
229-
| Bun | {% octicon "check" aria-label="Supported" %} |
230-
| Cargo | {% octicon "check" aria-label="Supported" %} |
231-
| Composer | {% octicon "check" aria-label="Supported" %} |
232-
| Devcontainers | {% octicon "x" aria-label="Not supported" %} |
233-
| Docker | {% octicon "x" aria-label="Not supported" %} |
234-
| Docker Compose | {% octicon "x" aria-label="Not supported" %} |
235-
| Dotnet SDK | {% octicon "check" aria-label="Supported" %} |
236-
| Elm | {% octicon "check" aria-label="Supported" %} |
237-
| {% data variables.product.prodname_actions %} | {% octicon "x" aria-label="Not supported" %} |
238-
| Gitsubmodule | {% octicon "x" aria-label="Not supported" %} |
239-
| Gomod (Go Modules) | {% octicon "check" aria-label="Supported" %} |
240-
| Gradle | {% octicon "check" aria-label="Supported" %} |
241-
| Helm | {% octicon "x" aria-label="Not supported" %} |
242-
| Hex (Hex) | {% octicon "check" aria-label="Supported" %} |
228+
| Bundler | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
229+
| Bun | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
230+
| Cargo | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
231+
| Composer | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
232+
| {% ifversion dependabot-conda-support %} |
233+
| Conda | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
234+
| {% endif %} |
235+
| Deno | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
236+
| Devcontainers | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
237+
| Docker | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
238+
| Docker Compose | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
239+
| Dotnet SDK | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
240+
| Elm | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
241+
| {% data variables.product.prodname_actions %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
242+
| Gitsubmodule | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
243+
| Gomod (Go Modules) | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
244+
| Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
245+
| Helm | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
246+
| Hex (Hex) | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
243247
| {% ifversion dependabot-julia-support %} |
244-
| Julia | {% octicon "check" aria-label="Supported" %} |
248+
| Julia | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
245249
| {% endif %} |
246-
| Maven | {% octicon "check" aria-label="Supported" %} |
247-
| NPM and Yarn | {% octicon "check" aria-label="Supported" %} |
248-
| NuGet | {% octicon "check" aria-label="Supported" %} |
250+
| Maven | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
251+
| {% ifversion dependabot-nix-support %} |
252+
| Nix flakes | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
253+
| {% endif %} |
254+
| NPM and Yarn | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
255+
| NuGet | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
249256
| {% ifversion dependabot-opentofu-support %} |
250-
| OpenTofu | {% octicon "check" aria-label="Supported" %} |
257+
| OpenTofu | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
258+
| {% endif %} |
259+
| Pip | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
260+
| {% ifversion dependabot-pre-commit-support %} |
261+
| pre-commit | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
262+
| {% endif %} |
263+
| Pub | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
264+
| {% ifversion dependabot-rust-toolchain-support %} |
265+
| Rust toolchain | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
266+
| {% endif %} |
267+
| Swift | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
268+
| Terraform | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
269+
| UV | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
270+
| {% ifversion dependabot-vcpkg-support %} |
271+
| vcpkg | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} |
251272
| {% endif %} |
252-
| Pip | {% octicon "check" aria-label="Supported" %} |
253-
| Pub | {% octicon "check" aria-label="Supported" %} |
254-
| Swift | {% octicon "check" aria-label="Supported" %} |
255-
| Terraform | {% octicon "x" aria-label="Not supported" %} |
256-
| UV | {% octicon "check" aria-label="Supported" %} |
257273

258274
> [!NOTE]
259275
>

content/copilot/reference/copilot-usage-metrics/copilot-usage-metrics.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ For example schemas of the data returned by the APIs, see [AUTOTITLE](/copilot/r
8080
| `chat_panel_ask_mode` | Captures user-initiated interactions in the chat panel with ask mode selected. |
8181
| `chat_panel_custom_mode` | Captures user-initiated interactions in the chat panel with a custom agent selected. |
8282
| `chat_panel_edit_mode` | Captures user-initiated interactions in the chat panel with edit mode selected. |
83+
| `chat_panel_plan_mode` | Captures user-initiated interactions in the chat panel with plan mode selected. |
8384
| `chat_panel_unknown_mode` | Captures user-initiated interactions in the chat panel where the mode is unknown. |
8485
| `code_generation_activity_count` | Number of distinct {% data variables.product.prodname_copilot_short %} output events generated. <br><br> **Includes:** All generated content, including comments and docstrings. <br> **Multiple blocks:** Each distinct code block from a single user prompt counts as a separate generation. <br> **Note:** This metric is not directly comparable to `user_initiated_interaction_count`, since one prompt can produce multiple generations. |
8586
| `code_acceptance_activity_count` | Number of suggestions or code blocks accepted by users. <br><br> **Counts:** All built-in accept actions, such as “apply to file,” “insert at cursor,” “insert into terminal,” and use of the **Copy** button. <br> **Does not count:** Manual OS clipboard actions (for example, <kbd>Ctrl</kbd>+<kbd>C</kbd>). <br> **Granularity:** Each acceptance action increments the count once, regardless of how many code blocks were generated by the initial prompt. |

content/copilot/tutorials/use-an-ai-sme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When you start work on an unfamiliar codebase, or you're asked to change a part
2020

2121
When you need to understand an unfamiliar codebase, you usually rely on a teammate who knows the code. When that person isn't available, {% data variables.copilot.copilot_cli_short %} can fill the gap. In this tutorial, you'll ask {% data variables.copilot.copilot_cli_short %} questions about a repository's code, learn prompting techniques that produce code-grounded answers, and build the confidence to start making changes.
2222

23-
## When to use an AI SME (or even When do I use an AI SME?)
23+
## When to use an AI SME
2424

2525
This tutorial is useful any time you need to understand a codebase faster. For example:
2626

data/features/disable-ghas-button.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
versions:
44
fpt: '*'
55
ghec: '*'
6-
ghes: '>= 3.21'
6+
ghes: '>= 3.22'

src/languages/lib/correct-translation-content.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ export function correctTranslatedContentStrings(
5858
)
5959

6060
// The translation pipeline frequently splits Markdown bullet markers
61-
// (`*`) and table-cell pipes (`|`) onto their own line, with the
62-
// actual content pushed to the next line as deeply indented text.
61+
// (`*` and `-`) and table-cell pipes (`|`) onto their own line, with
62+
// the actual content pushed to the next line as deeply indented text.
6363
// This breaks list and table rendering and leaves `[AUTOTITLE]` links
6464
// unexpanded. Rejoin the marker with its content. This corruption
65-
// affects every translated language (~47k bullets and ~11k cells in
66-
// total), so it lives in the universal pre-fixes block.
67-
content = content.replace(/^([ \t]*)\* ?\n[ \t]+/gm, '$1* ')
65+
// affects every translated language, so it lives in the universal
66+
// pre-fixes block.
67+
content = content.replace(/^([ \t]*)([*-]) ?\n[ \t]+/gm, '$1$2 ')
6868
content = content.replace(/^\|[ \t]*\n[ \t]+/gm, '| ')
6969

7070
// The same translator wrapping habit also strands heading markers

0 commit comments

Comments
 (0)