Skip to content

Commit b5f5592

Browse files
docs-botdocs-bot
authored
Merge pull request #43926 from github/repo-sync
Repo sync
2 parents 1988619 + 2993606 commit b5f5592

3 files changed

Lines changed: 63 additions & 8 deletions

File tree

‎.github/workflows/delete-orphan-translation-files.yml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,28 @@ jobs:
133133
--label "workflow-generated" \
134134
--head=$branch_name
135135
echo "Merge created PR..."
136-
retry_command gh pr merge --merge --auto --delete-branch "$branch_name"
136+
# Prefer enabling auto-merge so the PR waits for any required
137+
# checks before merging. If auto-merge can't be enabled — usually
138+
# because all required checks completed before this step ran and
139+
# the PR is already immediately mergeable — fall back to a direct
140+
# merge. GitHub returns one of these misleading errors in that
141+
# case: "Branch does not have required protected branch rules",
142+
# "Pull request is in unstable status", or "Pull request is not
143+
# in a mergeable state".
144+
auto_merge_err=$(mktemp)
145+
trap 'rm -f "$auto_merge_err"' EXIT
146+
if retry_command gh pr merge --merge --auto --delete-branch "$branch_name" 2>"$auto_merge_err"; then
147+
:
148+
else
149+
cat "$auto_merge_err"
150+
if grep -qE "does not have required protected branch rules|unstable status|Pull request is not in a mergeable state" "$auto_merge_err"; then
151+
echo "Auto-merge unavailable; PR appears immediately mergeable. Falling back to direct merge."
152+
retry_command gh pr merge --merge --delete-branch "$branch_name"
153+
else
154+
echo "Auto-merge failed with an unexpected error."
155+
exit 1
156+
fi
157+
fi
137158
138159
- uses: ./.github/actions/slack-alert
139160
if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

‎content/copilot/reference/copilot-allowlist-reference.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@ If your company employs security measures like a firewall or proxy server, you s
2424
| `https://github.com/enterprises/YOUR-ENTERPRISE/*` | Authentication for {% data variables.enterprise.prodname_managed_users %}, only required with {% data variables.product.prodname_emus %} |
2525
| `https://api.github.com/user` | User Management |
2626
| `https://api.github.com/copilot_internal/*` | User Management |
27-
| `https://copilot-telemetry.githubusercontent.com/telemetry` | Telemetry |
2827
| `https://collector.github.com/*` | Analytics telemetry |
29-
| `https://default.exp-tas.com` | Telemetry |
28+
| `https://copilot-telemetry.githubusercontent.com/telemetry` | {% data variables.product.prodname_copilot_short %} client telemetry |
29+
| `https://default.exp-tas.com` | {% data variables.product.prodname_copilot_short %} client experimentation |
3030
| `https://copilot-proxy.githubusercontent.com` | API service for {% data variables.product.prodname_copilot_short %} suggestions |
3131
| `https://origin-tracker.githubusercontent.com` | API service for {% data variables.product.prodname_copilot_short %} suggestions |
3232
| `https://*.githubcopilot.com/*`[^1] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
3333
| `https://*.individual.githubcopilot.com`[^2] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
3434
| `https://*.business.githubcopilot.com`[^3] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
3535
| `https://*.enterprise.githubcopilot.com`[^4] | API service for {% data variables.product.prodname_copilot_short %} suggestions |
36-
| `https://*.SUBDOMAIN.ghe.com` | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
37-
| `https://SUBDOMAIN.ghe.com` | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
38-
| `https://copilot-reports-*.b01.azurefd.net` | {% data variables.product.prodname_copilot_short %} usage metrics report downloads |
36+
| `https://*.SUBDOMAIN.ghe.com` | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
37+
| `https://SUBDOMAIN.ghe.com` | For {% data variables.product.prodname_copilot_short %} users on {% data variables.enterprise.data_residency_site %} |
38+
| `https://copilot-reports.github.com` | {% data variables.product.prodname_copilot_short %} usage metrics report downloads |
39+
| `https://copilot-reports-*.b01.azurefd.net`[^5] | {% data variables.product.prodname_copilot_short %} usage metrics report downloads (fallback) |
40+
| `https://usagereports*.blob.core.windows.net`[^6] | {% data variables.product.prodname_copilot_short %} usage metrics report downloads (fallback) |
3941

4042
Depending on the security policies and editors your organization uses, you may need to allowlist additional domains and URLs. For more information on specific editors, see [Further reading](#further-reading).
4143

@@ -397,3 +399,5 @@ The allowlist allows access to the following hosts:
397399
[^2]: Allows access to authorized users via a {% data variables.copilot.copilot_individuals_short %} plan. Do not add this URL to your allowlist if you are using subscription-based network routing.
398400
[^3]: Allows access to authorized users via a {% data variables.copilot.copilot_business_short %} plan. Do not add this URL to your allowlist if you want to use subscription-based network routing to block users from using {% data variables.copilot.copilot_business_short %} on your network.
399401
[^4]: Allows access to authorized users via a {% data variables.copilot.copilot_enterprise_short %} plan. Do not add this URL to your allowlist if you want to use subscription-based network routing to block users from using {% data variables.copilot.copilot_enterprise_short %} on your network.
402+
[^5]: Required for fallback scenarios where {% data variables.product.prodname_copilot_short %} usage metrics report downloads bypass the custom domain and are served from an Azure Front Door CDN.
403+
[^6]: Required for fallback scenarios where {% data variables.product.prodname_copilot_short %} usage metrics report downloads bypass the Azure Front Door CDN and are served directly from Azure Blob Storage.

‎eslint.config.ts‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ export default [
100100
// Disabled rules to review
101101
'no-console': 'off', // 800+
102102

103-
// Custom rules (disabled by default for now)
104-
'custom-rules/use-custom-logger': 'off',
103+
// Custom rules
104+
'custom-rules/use-custom-logger': 'error',
105105

106106
// Prevent direct res.redirect() usage — use res.safeRedirect() instead
107107
// to avoid open redirect vulnerabilities via protocol-relative URLs.
@@ -169,6 +169,36 @@ export default [
169169
},
170170
},
171171

172+
// Directories not yet migrated to structured logger (see github/docs-engineering#5639)
173+
// Remove directories from this list as they are migrated
174+
{
175+
files: [
176+
'src/ai-tools/**/*.{ts,js}',
177+
'src/article-api/**/*.{ts,js}',
178+
'src/audit-logs/**/*.{ts,js}',
179+
'src/changelogs/**/*.{ts,js}',
180+
'src/color-schemes/**/*.{ts,js}',
181+
'src/content-render/**/*.{ts,js}',
182+
'src/data-directory/**/*.{ts,js}',
183+
'src/dev-toc/**/*.{ts,js}',
184+
'src/events/**/*.{ts,js}',
185+
'src/fixtures/**/*.{ts,js}',
186+
'src/frame/**/*.{ts,js}',
187+
'src/github-apps/**/*.{ts,js}',
188+
'src/journeys/**/*.{ts,js}',
189+
'src/languages/**/*.{ts,js}',
190+
'src/links/**/*.{ts,js}',
191+
'src/metrics/**/*.{ts,js}',
192+
'src/observability/**/*.{ts,js}',
193+
'src/rest/**/*.{ts,js}',
194+
'src/search/**/*.{ts,js}',
195+
'src/shielding/**/*.{ts,js}',
196+
],
197+
rules: {
198+
'custom-rules/use-custom-logger': 'off',
199+
},
200+
},
201+
172202
// Override for scripts, tests, workflows, content-linter, and React files (disable custom logger rule)
173203
{
174204
files: [

0 commit comments

Comments
 (0)