Skip to content

Commit 4ace62f

Browse files
authored
Merge pull request #41687 from github/repo-sync
Repo sync
2 parents 95abba3 + a89743b commit 4ace62f

File tree

51 files changed

+1423
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1423
-190
lines changed

content/code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates.md

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,20 @@ By default, {% data variables.product.prodname_dependabot %} will stop rebasing
5757

5858
You can use any of the following commands on a {% data variables.product.prodname_dependabot %} pull request.
5959

60-
* `@dependabot cancel merge` cancels a previously requested merge.
61-
* `@dependabot close` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from recreating that pull request. You can achieve the same result by closing the pull request manually.
62-
* `@dependabot ignore this dependency` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this dependency (unless you reopen the pull request or upgrade to the suggested version of the dependency yourself).
63-
* `@dependabot ignore this major version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this major version (unless you reopen the pull request or upgrade to this major version yourself).
64-
* `@dependabot ignore this minor version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this minor version (unless you reopen the pull request or upgrade to this minor version yourself).
65-
* `@dependabot ignore this patch version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this patch version (unless you reopen the pull request or upgrade to this patch version yourself).
66-
* `@dependabot merge` merges the pull request once your CI tests have passed.
67-
* `@dependabot rebase` rebases the pull request.
68-
* `@dependabot recreate` recreates the pull request, overwriting any edits that have been made to the pull request.
69-
* `@dependabot reopen` reopens the pull request if the pull request is closed.
70-
* `@dependabot show DEPENDENCY_NAME ignore conditions` retrieves information on the ignore conditions for the specified dependency, and comments on the pull request with a table that displays all ignore conditions for the dependency. For example, `@dependabot show express ignore conditions` would find all `ignore` conditions stored for the Express dependency, and comment on the pull request with that information.
71-
* `@dependabot squash and merge` squashes and merges the pull request once your CI tests have passed.
60+
| Command | Description |
61+
| --- | --- |
62+
| `@dependabot cancel merge` | Cancels a previously requested merge. |
63+
| `@dependabot close` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from recreating that pull request. You can achieve the same result by closing the pull request manually. |
64+
| `@dependabot ignore this dependency` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this dependency (unless you reopen the pull request or upgrade to the suggested version yourself). |
65+
| `@dependabot ignore this major version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this major version (unless you reopen the pull request or upgrade to this major version yourself). |
66+
| `@dependabot ignore this minor version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this minor version (unless you reopen the pull request or upgrade to this minor version yourself). |
67+
| `@dependabot ignore this patch version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from creating any more pull requests for this patch version (unless you reopen the pull request or upgrade to this patch version yourself). |
68+
| `@dependabot merge` | Merges the pull request once your CI tests have passed. |
69+
| `@dependabot rebase` | Rebases the pull request. |
70+
| `@dependabot recreate` | Recreates the pull request, overwriting any edits that have been made to the pull request. |
71+
| `@dependabot reopen` | Reopens the pull request if the pull request is closed. |
72+
| `@dependabot show DEPENDENCY_NAME ignore conditions` | Retrieves information on the ignore conditions for the specified dependency, and comments on the pull request with a table that displays all ignore conditions for the dependency. For example, `@dependabot show express ignore conditions` would find all `ignore` conditions stored for the Express dependency, and comment on the pull request with that information. |
73+
| `@dependabot squash and merge` | Squashes and merges the pull request once your CI tests have passed. |
7274

7375
{% data variables.product.prodname_dependabot %} will react with a "thumbs up" emoji to acknowledge the command, and may respond with a comment on the pull request. While {% data variables.product.prodname_dependabot %} usually responds quickly, some commands may take several minutes to complete if {% data variables.product.prodname_dependabot %} is busy processing other updates or commands.
7476

@@ -80,13 +82,15 @@ For more information, see [AUTOTITLE](/code-security/dependabot/working-with-dep
8082

8183
In {% data variables.product.prodname_dependabot %} pull requests for grouped version updates and security updates, you can use comment commands to ignore and un-ignore updates for specific dependencies and versions. You can use any of the following commands to manage ignore conditions for grouped updates.
8284

83-
* `@dependabot ignore DEPENDENCY_NAME` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency.
84-
* `@dependabot ignore DEPENDENCY_NAME major version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's major version.
85-
* `@dependabot ignore DEPENDENCY_NAME minor version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's minor version.
86-
* `@dependabot ignore DEPENDENCY_NAME patch version` closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's patch version.
87-
* `@dependabot unignore *` closes the current pull request, clears all `ignore` conditions stored for all dependencies in the group, then opens a new pull request.
88-
* `@dependabot unignore DEPENDENCY_NAME` closes the current pull request, clears all `ignore` conditions stored for the dependency, then opens a new pull request that includes available updates for the specified dependency. For example, `@dependabot unignore lodash` would open a new pull request that includes updates for the Lodash dependency.
89-
* `@dependabot unignore DEPENDENCY_NAME IGNORE_CONDITION` closes the current pull request, clears the stored `ignore` condition, then opens a new pull request that includes available updates for the specified ignore condition. For example, `@dependabot unignore express [< 1.9, > 1.8.0]` would open a new pull request that includes updates for Express between versions 1.8.0 and 1.9.0.
85+
| Command | Description |
86+
| --- | --- |
87+
| `@dependabot ignore DEPENDENCY_NAME` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency. |
88+
| `@dependabot ignore DEPENDENCY_NAME major version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's major version. |
89+
| `@dependabot ignore DEPENDENCY_NAME minor version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's minor version. |
90+
| `@dependabot ignore DEPENDENCY_NAME patch version` | Closes the pull request and prevents {% data variables.product.prodname_dependabot %} from updating this dependency's patch version. |
91+
| `@dependabot unignore *` | Closes the current pull request, clears all `ignore` conditions stored for all dependencies in the group, then opens a new pull request. |
92+
| `@dependabot unignore DEPENDENCY_NAME` | Closes the current pull request, clears all `ignore` conditions stored for the dependency, then opens a new pull request that includes available updates for the specified dependency. For example, `@dependabot unignore lodash` would open a new pull request that includes updates for the Lodash dependency. |
93+
| `@dependabot unignore DEPENDENCY_NAME IGNORE_CONDITION` | Closes the current pull request, clears the stored `ignore` condition, then opens a new pull request that includes available updates for the specified ignore condition. For example, `@dependabot unignore express [< 1.9, > 1.8.0]` would open a new pull request that includes updates for Express between versions 1.8.0 and 1.9.0. |
9094

9195
> [!TIP]
9296
> When you want to un-ignore a specific ignore condition, use the `@dependabot show DEPENDENCY_NAME ignore conditions` command to quickly check what ignore conditions a dependency currently has.

content/copilot/concepts/auto-model-selection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ category:
1717

1818
Experience less rate limiting and reduce the mental load of choosing a model by letting {% data variables.copilot.copilot_auto_model_selection %} automatically choose the best available model on your behalf.
1919

20-
{% data variables.copilot.copilot_auto_model_selection %} is currently optimized for model availability, choosing from a list of models that may change over time. It currently chooses from {% data variables.copilot.copilot_gpt_41 %}, {% data variables.copilot.copilot_gpt_5_mini %}, {% data variables.copilot.copilot_gpt_5 %}, {% data variables.copilot.copilot_claude_haiku_45 %}, and {% data variables.copilot.copilot_claude_sonnet_45 %}, based on your subscription type.
20+
{% data variables.copilot.copilot_auto_model_selection %} is currently optimized for model availability, choosing from a list of models that may change over time. It currently chooses from {% data variables.copilot.copilot_gpt_41 %}, {% data variables.copilot.copilot_gpt_5_mini %}, {% data variables.copilot.copilot_gpt_51_codex_max %}, {% data variables.copilot.copilot_claude_haiku_45 %}, {% data variables.copilot.copilot_claude_sonnet_45 %}, and {% data variables.copilot.copilot_gemini_3_pro %}, based on your subscription type.
2121

2222
With {% data variables.copilot.copilot_auto_model_selection %}, you benefit from:
2323
* Reduced chances of rate limiting

content/copilot/how-tos/use-copilot-agents/coding-agent/extend-coding-agent-with-mcp.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,21 @@ If you want to allow {% data variables.product.prodname_copilot_short %} to acce
310310
"github-mcp-server": {
311311
"type": "http",
312312
// Remove "/readonly" to enable wider access to all tools.
313-
// Then, use the "tools" key to specify the subset of tools you'd like to include.
313+
// Then, use the "X-MCP-Toolsets" header to specify which toolsets you'd like to include.
314+
// Use the "tools" field to select individual tools from the toolsets.
314315
"url": "https://api.githubcopilot.com/mcp/readonly",
315-
"tools": ["*"]
316+
"tools": ["*"],
317+
"headers": {
318+
"X-MCP-Toolsets": "repos,issues,users,pull_requests,code_security,secret_protection,actions,web_search"
319+
}
316320
}
317321
}
318322
}
319323
```
320324

325+
326+
For more information on toolsets, refer to the [README](https://github.com/github/github-mcp-server?tab=readme-ov-file#available-toolsets) in the {% data variables.product.github %} Remote MCP Server documentation.
327+
321328
1. Click **Save**.
322329
{% data reusables.actions.sidebar-environment %}
323330
1. Click the `copilot` environment.

content/copilot/reference/ai-models/model-hosting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Used for:
2727
* {% data variables.copilot.copilot_gpt_51 %}
2828
* {% data variables.copilot.copilot_gpt_51_codex %}
2929
* {% data variables.copilot.copilot_gpt_51_codex_mini %}
30+
* {% data variables.copilot.copilot_gpt_51_codex_max %}
3031

3132
These models are hosted by OpenAI and {% data variables.product.github %}'s Azure infrastructure.
3233

data/tables/copilot/model-multipliers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
multiplier_paid: 0.33
7070
multiplier_free: Not applicable
7171

72+
- name: GPT-5.1-Codex-Max
73+
multiplier_paid: 1.0
74+
multiplier_free: Not applicable
75+
7276
- name: Grok Code Fast 1
7377
multiplier_paid: 0.25
7478
multiplier_free: Not applicable

data/tables/copilot/model-release-status.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@
6767
ask_mode: true
6868
edit_mode: true
6969

70+
- name: 'GPT-5.1-Codex-Max'
71+
provider: 'OpenAI'
72+
release_status: 'Public preview'
73+
agent_mode: true
74+
ask_mode: true
75+
edit_mode: true
76+
7077
# Anthropic models
7178
- name: 'Claude Haiku 4.5'
7279
provider: 'Anthropic'

data/tables/copilot/model-supported-clients.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@
125125
xcode: true
126126
jetbrains: true
127127

128+
- name: GPT-5.1-Codex-Max
129+
dotcom: true
130+
vscode: true
131+
vs: false
132+
eclipse: false
133+
xcode: false
134+
jetbrains: false
135+
128136
- name: Grok Code Fast 1
129137
dotcom: true
130138
vscode: true

data/tables/copilot/model-supported-plans.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@
110110
business: true
111111
enterprise: true
112112

113+
- name: GPT-5.1-Codex-Max
114+
free: false
115+
pro: true
116+
pro_plus: true
117+
business: true
118+
enterprise: true
119+
113120
- name: Grok Code Fast 1
114121
free: false
115122
pro: true

data/variables/copilot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ copilot_gpt_5_mini: 'GPT-5 mini'
158158
copilot_gpt_51: 'GPT-5.1'
159159
copilot_gpt_51_codex: 'GPT-5.1-Codex'
160160
copilot_gpt_51_codex_mini: 'GPT-5.1-Codex-Mini'
161+
copilot_gpt_51_codex_max: 'GPT-5.1-Codex-Max'
161162
# OpenAI 'o' series:
162163
copilot_o3: 'o3'
163164
copilot_o4_mini: 'o4-mini'

src/article-api/README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,24 @@ Article API endpoints allow consumers to query GitHub Docs for listings of curre
1313

1414
The `/api/article/meta` endpoint powers hovercards, which provide a preview for internal links on <docs.github.com>.
1515

16+
The `/api/article/body` endpoint can serve markdown for both regular articles and autogenerated content (such as REST API documentation) using specialized transformers.
17+
1618
## How it works
1719

1820
The `/api/article` endpoints return information about a page by `pathname`.
1921

2022
`api/article/meta` is highly cached, in JSON format.
2123

24+
### Autogenerated Content Transformers
25+
26+
For autogenerated pages (REST, landing pages, audit logs, webhooks, GraphQL, etc), the Article API uses specialized transformers to convert the rendered content into markdown format. These transformers are located in `src/article-api/transformers/` and use an extensible architecture:
27+
28+
To add a new transformer for other autogenerated content types:
29+
1. Create a new transformer file implementing the `PageTransformer` interface
30+
2. Register it in `transformers/index.ts`
31+
3. Create a template in `templates/` to configure how the transformer will organize the autogenerated content
32+
4. The transformer will automatically be used by `/api/article/body`
33+
2234
## How to get help
2335

2436
For internal folks ask in the Docs Engineering slack channel.
@@ -34,12 +46,13 @@ Get article metadata and content in a single object. Equivalent to calling `/art
3446

3547
**Parameters**:
3648
- **pathname** (string) - Article path (e.g. '/en/get-started/article-name')
49+
- **[apiVersion]** (string) - API version for REST pages (optional, defaults to latest)
3750

3851
**Returns**: (object) - JSON object with article metadata and content (`meta` and `body` keys)
3952

4053
**Throws**:
4154
- (Error): 403 - If the article body cannot be retrieved. Reason is given in the error message.
42-
- (Error): 400 - If pathname parameter is invalid.
55+
- (Error): 400 - If pathname or apiVersion parameters are invalid.
4356
- (Error): 404 - If the path is valid, but the page couldn't be resolved.
4457

4558
**Example**:
@@ -63,12 +76,13 @@ Get the contents of an article's body.
6376

6477
**Parameters**:
6578
- **pathname** (string) - Article path (e.g. '/en/get-started/article-name')
79+
- **[apiVersion]** (string) - API version (optional, defaults to latest)
6680

6781
**Returns**: (string) - Article body content in markdown format.
6882

6983
**Throws**:
7084
- (Error): 403 - If the article body cannot be retrieved. Reason is given in the error message.
71-
- (Error): 400 - If pathname parameter is invalid.
85+
- (Error): 400 - If pathname or apiVersion parameters are invalid.
7286
- (Error): 404 - If the path is valid, but the page couldn't be resolved.
7387

7488
**Example**:

0 commit comments

Comments
 (0)