Skip to content

Commit fc41d81

Browse files
authored
Merge pull request #41896 from github/repo-sync
Repo sync
2 parents 211e670 + d3a61e5 commit fc41d81

File tree

4 files changed

+151
-5
lines changed

4 files changed

+151
-5
lines changed

content/code-security/secret-scanning/introduction/supported-secret-scanning-patterns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you believe that {% data variables.product.prodname_secret_scanning %} should
3131

3232
## Supported secrets
3333

34-
This table lists the secrets supported by {% data variables.product.prodname_secret_scanning %}. You can see the types of alert that get generated for each token, as well as whether a validity check is performed on the token.
34+
The tables list the secrets supported by {% data variables.product.prodname_secret_scanning %} for each secret type. Information in the tables may include this data:
3535

3636
* **Provider:** Name of the token provider.{% ifversion fpt or ghec %}
3737
* **Partner:** Token for which leaks are reported to the relevant token partner. Applies to public repositories and all gists, including secret gists. Secret gists are not private and can be accessed by anyone with the URL. See [About gists](/get-started/writing-on-github/editing-and-sharing-content-with-gists/creating-gists#about-gists).
@@ -44,8 +44,8 @@ This table lists the secrets supported by {% data variables.product.prodname_sec
4444
* Applies to private repositories where {% data variables.product.prodname_GH_secret_protection %} and {% data variables.product.prodname_secret_scanning %} are enabled.
4545
* Includes {% ifversion secret-scanning-alert-experimental-list %}default{% else %}high confidence{% endif %} tokens, which relate to supported patterns and specified custom patterns, as well as non-provider tokens such as private keys, which often result in false positives.{% endif %}
4646
* **Push protection:** Token for which leaks are reported to users on {% data variables.product.prodname_dotcom %}. Applies to repositories with {% data variables.product.prodname_secret_scanning %} and push protection enabled.
47-
4847
* **Validity check:** Token for which a validity check is implemented. {% ifversion secret-scanning-validity-check-partner-patterns %}For partner tokens, {% data variables.product.prodname_dotcom %} sends the token to the relevant partner. Note that not all partners are based in the United States. For more information, see [{% data variables.product.prodname_AS %}](/free-pro-team@latest/site-policy/github-terms/github-terms-for-additional-products-and-features#advanced-security) in the Site Policy documentation.{% else %} Currently only applies to {% data variables.product.prodname_dotcom %} tokens.{% endif %}
48+
* **Base64:** Token for which Base64-encoded versions are supported.
4949

5050
### Non-provider patterns
5151

data/reusables/enterprise_installation/replication-command.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66

77
> [!WARNING]
88
> `ghe-repl-start` causes a brief outage on the primary server, during which users may see internal server errors. To provide a friendlier message, run `ghe-maintenance -s` on the primary node before running `ghe-repl-start` on the replica node to put the appliance in maintenance mode. Once replication starts, disable maintenance mode with `ghe-maintenance -u`. Git replication will not progress while the primary node is in maintenance mode.
9+
> If you are running version 3.14.20, 3.15.15, 3.16.11, 3.17.8, 3.18.2, or a later version including future releases like 3.19, you no longer need to put the primary in maintenance mode prior to running `ghe-repl-start`. This command is no longer expected to cause an outage on the primary server. However, when setting up a new replica, `ghe-repl-start` won't cause an outage as long as you run `ghe-config-apply` between `ghe-repl-setup` and `ghe-repl-start`. Skipping `ghe-config-apply` and going straight from `ghe-repl-setup` to `ghe-repl-start` will still result in an outage.

src/journeys/README.md

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
# Journeys
2+
3+
The **journeys** subject provides guided learning experiences (called "tracks") that help users navigate through a sequence of related documentation articles. Tracks appear on special landing pages and provide contextual navigation to move through articles in a structured learning path.
4+
5+
## Purpose & Scope
6+
7+
This subject is responsible for:
8+
- Rendering journey landing pages that display multiple learning tracks
9+
- Providing prev/next navigation within journey track articles
10+
- Resolving journey context based on the current article path
11+
- Rendering Liquid templates in journey metadata (titles, descriptions, guide paths)
12+
13+
Journey tracks are defined in article frontmatter using the `journeyTracks` field on pages with `layout: journey-landing`.
14+
15+
## Architecture & Key Assets
16+
17+
```
18+
src/journeys/
19+
├── components/
20+
│ ├── JourneyTrackCard.tsx # Card showing journey progress with next/prev links
21+
│ ├── JourneyTrackNav.tsx # Navigation bar for prev/next articles in a track
22+
│ └── index.ts # Component exports
23+
├── lib/
24+
│ ├── get-link-data.ts # Fetches title and href data for journey guide links
25+
│ └── journey-path-resolver.ts # Core logic: resolves journey context and tracks
26+
├── middleware/
27+
│ └── journey-track.ts # Express middleware that attaches journey data to requests
28+
└── tests/
29+
└── journey-path-resolver.ts # Unit tests for journey resolution logic
30+
```
31+
32+
33+
34+
## Setup & Usage
35+
36+
### Prerequisites
37+
- Journey landing pages must have `layout: journey-landing` in their frontmatter
38+
- Journey tracks are defined in the `journeyTracks` frontmatter field (see example below)
39+
40+
### Running tests
41+
```bash
42+
npm run test -- src/journeys/tests
43+
```
44+
45+
### Example frontmatter for journey landing page
46+
```yaml
47+
---
48+
title: Enterprise onboarding
49+
layout: journey-landing
50+
journeyTracks:
51+
- id: 'getting_started'
52+
title: 'Getting started with {% data variables.product.prodname_ghe_cloud %}'
53+
description: 'Master the fundamentals and get started with a trial.'
54+
guides:
55+
- '/enterprise-onboarding/choose-an-enterprise-type'
56+
- '/enterprise-onboarding/setting-up-a-trial'
57+
- '/enterprise-onboarding/adding-users'
58+
---
59+
```
60+
61+
## Data & External Dependencies
62+
63+
### Data inputs
64+
- **Content frontmatter**: `journeyTracks` field on landing pages defines track structure
65+
- **Article metadata**: Article titles and paths are resolved via `get-link-data.ts`
66+
- **Liquid variables**: Track titles, descriptions, and guide paths support Liquid templating
67+
68+
### Dependencies
69+
- **`@/content-render`**: Used to render Liquid templates in journey metadata
70+
- **`@/frame/lib/path-utils`**: Normalizes paths for consistent matching
71+
- **`@/versions`**: Checks version compatibility between journey pages and articles
72+
- **`@/languages`**: Executes rendering with fallback for internationalization
73+
- **`@/landings`**: Journey components are consumed by landing page layouts
74+
75+
### Data outputs
76+
- **`req.context.currentJourneyTrack`**: Journey context object with track info and prev/next links
77+
- **`req.context.page.resolvedJourneyTracks`**: Array of resolved track data for landing pages
78+
79+
## Current State & Next Steps
80+
81+
### Known limitations
82+
- Journey tracks currently inherit version constraints from their landing page
83+
- Path normalization logic must stay synchronized with other path-handling middleware
84+
- Journey context resolution has some performance overhead due to iterating all pages
85+
- Currently only support a particular page belonging to a single journey track/step - we won't show nav components for all the journeys an article belongs to
86+
87+
Continued work to expand and add more journey tracks.

src/landings/README.md

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,65 @@
11
# Landing pages
22

3-
Landing pages include the Docs home page, the product landing pages, and product guides pages.
3+
The landings subject provides components and logic for rendering various types of landing pages across docs.github.com, including the Docs home page, product landing pages, product guides pages, category pages, and specialized layouts like journey and discovery landings.
44

5-
## What landing pages are for
5+
## Purpose & Scope
66

7-
Landing pages provide a hierarchical view of their area, making navigating the Docs easier.
7+
This subject is responsible for:
8+
- Rendering different landing page layouts (product, guides, category, journey, discovery, bespoke)
9+
- Building and displaying featured links, article cards, and guide cards
10+
- Managing landing page context and data requirements
11+
- Providing hierarchical navigation for products and categories
12+
- Displaying article carousels and product releases
13+
14+
Landing pages serve as navigational hubs that provide a hierarchical view of their area, making it easier to find and discover documentation.
15+
16+
## Architecture & Key Assets
17+
18+
| Landing Page Type | Layout Value | Purpose |
19+
|-------------------|--------------|---------|
20+
| Product landing | `product-landing` | Product overview pages with featured links and release notes |
21+
| Product guides | `product-guides` | Product guides listing organized by categories |
22+
| Category landing | `category-landing` | Category pages with hierarchical navigation |
23+
| Table of contents | `toc-landing` | Table of contents pages |
24+
| Journey landing | `journey-landing` | Guided learning journey pages with track navigation |
25+
| Discovery landing | `discovery-landing` | Discovery/exploration pages |
26+
| Home page | (special) | Docs.github.com homepage |
27+
28+
## Setup & Usage
29+
30+
### Running tests
31+
32+
```bash
33+
npm run test -- src/landings/tests
34+
```
35+
36+
## Data & External Dependencies
37+
38+
### Data inputs
39+
- Page frontmatter: `layout`, `featuredLinks`, `journeyTracks`, etc.
40+
- Content tree: Used to build TOC and navigation hierarchies
41+
- Product metadata: Product names, versions, release information
42+
43+
### Dependencies
44+
- [`@/frame`](../frame/README.md) - Context object, page data, shared components
45+
- [`@/content-render`](../content-render/README.md) - Renders Liquid in featured link titles
46+
- [`@/learning-track`](../learning-track/README.md) - Learning track data resolution
47+
- [`@/journeys`](../journeys/README.md) - Journey track components and data
48+
- [`@/products`](../products/README.md) - Product metadata and groupings
49+
- [`@/versions`](../versions/README.md) - Version-aware content filtering
50+
51+
### Data outputs
52+
- `req.context.featuredLinks` - Resolved featured link data
53+
- Landing page contexts - Various context objects passed to React components
54+
- Rendered landing pages - Final HTML output
55+
56+
## Current State & Next Steps
57+
58+
### Known limitations
59+
- Multiple similar but distinct landing components (could be consolidated)
60+
- Featured links limited to 4 per category to avoid overly tall columns
61+
- Bespoke landing pages require custom components rather than data-driven approach
62+
63+
### Areas for improvement
64+
- Standardize landing page patterns and consolidate overlapping types
65+
- Make landing pages more data-driven and less code-heavy

0 commit comments

Comments
 (0)