Skip to content

Commit 48c2603

Browse files
authored
Merge pull request #45724 from github/repo-sync
Repo sync
2 parents 143af21 + 97a5764 commit 48c2603

16 files changed

Lines changed: 120 additions & 31 deletions

.github/workflows/check-for-spammy-issues.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
2929
const titleWordCount = issue.title.trim().split(' ').length
3030
const titleWordCountMin = 3
31+
const urlRegex = /https?:\/\/\S+/i
32+
const titleHasUrl = urlRegex.test(issue.title)
3133
3234
try {
3335
await github.rest.teams.getMembershipForUserInOrg({
@@ -43,7 +45,7 @@ jobs:
4345
// An error will be thrown if the user is not a GitHub employee
4446
// If a user is not a GitHub employee, we should check to see if title has at least the minimum required number of words in it and if it does, we can exit the workflow
4547
46-
if (titleWordCount >= titleWordCountMin) {
48+
if (titleWordCount >= titleWordCountMin && !titleHasUrl) {
4749
return
4850
}
4951
}

.github/workflows/check-for-spammy-prs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ jobs:
4040
const totalChanges = files.reduce((sum, f) => sum + f.additions + f.deletions, 0)
4141
const isOneLineAddition = files.every(f => f.status === 'added') && totalChanges <= 1
4242
const isBlankLineEdit = totalChanges <= 1 && files.every(f => f.status === 'modified')
43+
const onlyRenames = files.length > 0 && files.every(f => f.status === 'renamed')
4344
4445
// Close the PR and add the invalid label
45-
if (onlyDeletes || isEmptyCommit || touchesTooMany || isOneLineAddition || isBlankLineEdit) {
46+
if (onlyDeletes || isEmptyCommit || touchesTooMany || isOneLineAddition || isBlankLineEdit || onlyRenames) {
4647
await github.rest.issues.update({
4748
owner: owner,
4849
repo: repo,

content/admin/upgrading-your-instance/preparing-to-upgrade/check-system-capacity-before-upgrading.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Check current numbers:
213213
* Resque workers
214214

215215
```shell
216-
ps -ef | grep aqueduct-1.1.0 | grep -v "grep aqueduct-1.1.0" | wc -l
216+
ps -ef | grep -E 'aqueduct-[0-9]' | grep -v grep | wc -l
217217
```
218218

219219
#### 3. Adjust configuration

content/pull-requests/reference/stacked-prs-cli-commands.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ Add a new branch on top of the current stack.
9393
gh stack add [flags] [branch]
9494
```
9595

96-
Creates a new branch at the current HEAD, adds it to the top of the stack, and checks it out. You must run this command while on the topmost branch of a stack. If you do not provide a branch name, the command prompts for one.
96+
For an existing stack, creates a new branch at the current HEAD, adds it to the top of the stack, and checks it out. You must run this command while on the topmost branch of a stack. If you do not provide a branch name, the command prompts for one.
97+
98+
When you run the command interactively from a branch that is not part of a stack, `add` offers to initialize a new stack instead. The branch name you supply, or the auto-generated name, becomes the first layer. If you don't supply a name, the standard `init` prompts are used.
9799

98100
You can optionally stage changes and create a commit as part of the `add` flow. When you provide `-m` without an explicit branch name, the branch name is generated automatically in date and slug format, such as `03-24-add_login`.
99101

@@ -143,7 +145,7 @@ Shows all branches in the stack, their ordering, pull request links, and the mos
143145

144146
| Flag | Description |
145147
|------|-------------|
146-
| `-s, --short` | Compact output (branch names only) |
148+
| `-s, --short` | Compact one-line-per-branch output |
147149
| `--json` | Output stack data as JSON |
148150

149151
**Examples:**
@@ -154,6 +156,8 @@ gh stack view --short
154156
gh stack view --json
155157
```
156158

159+
`gh stack view --short` uses OSC 8 hyperlinks for pull request numbers when the terminal supports them. Otherwise, the full URL is shown for copy and paste. Set `GH_STACK_HYPERLINKS=1` or `GH_STACK_HYPERLINKS=0` to override terminal detection.
160+
157161
### `gh stack checkout`
158162

159163
Check out a stack by its stack number, a pull request number, a pull request URL, or a branch name.
@@ -166,9 +170,9 @@ A bare number is interpreted first as a stack or pull request number. These are
166170

167171
When you reference a remote stack, the command fetches the stack on {% data variables.product.github %}, pulls the branches, and sets up the stack locally. If the stack already exists locally and matches, the command switches to the branch. If the local and remote stacks have different compositions, you are prompted to resolve the conflict.
168172

169-
When you provide a branch name, the command resolves it against locally tracked stacks only.
173+
When you provide a branch name, the command checks locally tracked stacks first. If the branch is not tracked locally, the command looks for the branch on remote stacks and pulls down the matching stack. If more than one stack matches, use a stack or pull request number to choose one explicitly.
170174

171-
When you run the command without arguments in an interactive terminal, it opens a searchable picker listing every stack available to you, both the stacks tracked locally and the stacks that exist only on {% data variables.product.github %}. Each row shows the stack number, its bottom and top branch, base branch, a status bar summarizing how many of its pull requests are merged, open, closed, or not yet pushed, and whether the stack is available locally or only on the remote. Filter with the **All**, **Local**, and **Remote** tabs, or type `/` to search. Fully merged stacks are omitted. Selecting a remote-only stack clones it locally before switching to it.
175+
When you run the command without arguments in an interactive terminal, it first checks whether the current branch belongs to a stack on the remote that is not tracked locally, and offers to check it out. If there is no unique match, or you decline, it opens a searchable picker listing every stack available to you, both the stacks tracked locally and the stacks that exist only on {% data variables.product.github %}. Each row shows the stack number, its bottom and top branch, base branch, a status bar summarizing how many of its pull requests are merged, open, closed, or not yet pushed, and whether the stack is available locally or only on the remote. Filter with the **All**, **Local**, and **Remote** tabs, or type `/` to search. Fully merged stacks are omitted. Selecting a remote-only stack clones it locally before switching to it.
172176

173177
**Examples:**
174178

@@ -182,7 +186,7 @@ gh stack checkout 42
182186
# Check out a stack by pull request URL
183187
gh stack checkout https://github.com/owner/repo/pull/42
184188

185-
# Check out a stack by branch name (local only)
189+
# Check out a stack by branch name
186190
gh stack checkout feature-auth
187191

188192
# Interactive — pick from all available stacks (local and remote)
@@ -687,6 +691,7 @@ gh stack feedback "Support for reordering branches"
687691
| Variable | Values | Description |
688692
|----------|--------|-------------|
689693
| `GH_STACK_THEME` | `auto` (default), `light`, `dark` | Controls the color palette of the interactive screens for `submit`, `modify`, and `view`, and all colored command output. Colors adapt to your terminal background automatically. Set this variable to force the light or dark palette when a terminal does not report its background, which can happen in some SSH or `tmux` setups. |
694+
| `GH_STACK_HYPERLINKS` | `0`, `1` | Disables or enables OSC 8 hyperlinks when terminal detection is incorrect. Unsupported terminals show the full URL by default. |
690695

691696
```shell
692697
# Force the light palette for one command

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
"@axe-core/playwright": "^4.11.1",
283283
"@eslint/js": "^9.39.3",
284284
"@github/markdownlint-github": "^0.6.3",
285-
"@graphql-inspector/core": "^7.1.2",
285+
"@graphql-inspector/core": "^8.0.0",
286286
"@graphql-tools/load": "^8.1.8",
287287
"@octokit/rest": "22.0.0",
288288
"@playwright/test": "^1.60.0",
@@ -324,7 +324,7 @@
324324
"eslint-plugin-prettier": "^5.5.5",
325325
"eslint-plugin-primer-react": "^9.0.0",
326326
"globals": "^17.3.0",
327-
"gpt-tokenizer": "^3.4.0",
327+
"gpt-tokenizer": "^4.0.0",
328328
"graphql": "^16.12.0",
329329
"http-status-code": "^2.1.0",
330330
"husky": "^9.1.7",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a1b4a3d4d0bcde9ec3a78ab99b2d63af121857a9
1+
2bd699a544a09cb5c45a013d03416e0894b0454e

src/graphql/data/fpt/changelog.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
[
2+
{
3+
"schemaChanges": [
4+
{
5+
"title": "The GraphQL schema includes these changes:",
6+
"changes": [
7+
"<p>Enum value 'ENTERPRISE_ORGANIZATION_CREATION<code>was added to enum</code>OrganizationInvitationSource'</p>",
8+
"<p>Enum value 'ADDED_TO_STACK_EVENT<code>was added to enum</code>PullRequestTimelineItemsItemType'</p>",
9+
"<p>Enum value 'REMOVED_FROM_STACK_EVENT<code>was added to enum</code>PullRequestTimelineItemsItemType'</p>"
10+
]
11+
}
12+
],
13+
"previewChanges": [],
14+
"upcomingChanges": [],
15+
"date": "2026-09-02"
16+
},
217
{
318
"schemaChanges": [
419
{

src/graphql/data/fpt/schema-enterprise-admin.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@
378378
"name": "createEnterpriseOrganization",
379379
"id": "createenterpriseorganization",
380380
"href": "/graphql/reference/enterprise-admin#mutation-createenterpriseorganization",
381-
"description": "<p>Creates an organization as part of an enterprise account. A personal access\ntoken used to create an organization is implicitly permitted to update the\norganization it created, if the organization is part of an enterprise that has\nSAML enabled or uses Enterprise Managed Users. If the organization is not part\nof such an enterprise, and instead has SAML enabled for it individually, the\ntoken will then require SAML authorization to continue working against that organization.</p>",
381+
"description": "<p>Creates an organization as part of an enterprise account. User-authenticated\nrequests make the viewer an owner and invite users in <code>adminLogins</code>.\nInstallation requests directly add listed enterprise members and invite other\nlisted users. Enterprise Managed User enterprises directly add managed users.\nInvitation failures do not roll back organization creation. A personal access\ntoken used to create an organization is implicitly permitted to update the\norganization it created, if the organization is part of an enterprise that has\nSAML enabled or uses Enterprise Managed Users. If the organization is not part\nof such an enterprise, and instead has SAML enabled for it individually, the\ntoken will then require SAML authorization to continue working against that organization.</p>",
382382
"isDeprecated": false,
383383
"inputFields": [
384384
{
@@ -12222,7 +12222,7 @@
1222212222
"inputFields": [
1222312223
{
1222412224
"name": "adminLogins",
12225-
"description": "<p>The logins for the administrators of the new organization.</p>",
12225+
"description": "<p>For user-authenticated requests, the logins of additional owners to invite.\nFor installation requests, existing enterprise members are added directly and\nother listed users are invited.</p>",
1222612226
"type": "[String!]!",
1222712227
"id": "string",
1222812228
"href": "/graphql/reference/other#scalar-string"

src/graphql/data/fpt/schema-orgs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10485,6 +10485,10 @@
1048510485
"description": "<p>The possible organization invitation sources.</p>",
1048610486
"isDeprecated": false,
1048710487
"values": [
10488+
{
10489+
"name": "ENTERPRISE_ORGANIZATION_CREATION",
10490+
"description": "<p>The invitation was created with an enterprise organization.</p>"
10491+
},
1048810492
{
1048910493
"name": "MEMBER",
1049010494
"description": "<p>The invitation was created from the web interface or from API.</p>"

0 commit comments

Comments
 (0)