From 52a12d8ff102d6ac41b8cac455684a28d16c13b4 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Tue, 9 Sep 2025 13:50:47 +0200 Subject: [PATCH 1/8] Update Pages docs about CI/CD templates --- .../project/pages/getting_started/pages_ci_cd_template.md | 3 ++- .../project/pages/getting_started/pages_from_scratch.md | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_ci_cd_template.md b/doc/user/project/pages/getting_started/pages_ci_cd_template.md index 0e87b6ead32b2f..6b2e85748b7483 100644 --- a/doc/user/project/pages/getting_started/pages_ci_cd_template.md +++ b/doc/user/project/pages/getting_started/pages_ci_cd_template.md @@ -23,8 +23,9 @@ these steps, you may have to do additional configuration for the Pages site to g 1. On the left sidebar, select **Search or go to** and find your project. 1. From the **Add** ({{< icon name="plus" >}}) dropdown list, select **New file**. -1. From the **Select a template type** dropdown list, select `.gitlab-ci.yml`. +1. In the **Filename** text box, enter `.gitlab-ci.yml`. An dropdown list appears to the right of the text box. 1. From the **Apply a template** dropdown list, in the **Pages** section, select the name of your SSG. + For plain HTML, select **HTML**. 1. In the **Commit message** box, type the commit message. 1. Select **Commit changes**. diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index 1fbc826407ed51..d3704f61c73905 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -22,6 +22,14 @@ This example uses Jekyll, but other SSGs follow similar steps. You do not need to be familiar with Jekyll or SSGs to complete this tutorial. +{{< alert type="note" >}} + +If instead, you'd like to create a Pages site with plain HTML: create your site, upload it to a +GitLab project, create the `.gitlab-ci.yml` file [from the `HTML` template](pages_ci_cd_template.md), +and continue with this tutorial's step 6: Deploy and view your website. + +{{< /alert >}} + To create a GitLab Pages website: - [Step 1: Create the project files](#create-the-project-files) -- GitLab From a2dd739d70a3da0d9947c0c5e2d49481b6c23ae0 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Tue, 9 Sep 2025 14:00:28 +0200 Subject: [PATCH 2/8] Fix a typo --- doc/user/project/pages/getting_started/pages_ci_cd_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_ci_cd_template.md b/doc/user/project/pages/getting_started/pages_ci_cd_template.md index 6b2e85748b7483..fb2b96712378c6 100644 --- a/doc/user/project/pages/getting_started/pages_ci_cd_template.md +++ b/doc/user/project/pages/getting_started/pages_ci_cd_template.md @@ -23,7 +23,7 @@ these steps, you may have to do additional configuration for the Pages site to g 1. On the left sidebar, select **Search or go to** and find your project. 1. From the **Add** ({{< icon name="plus" >}}) dropdown list, select **New file**. -1. In the **Filename** text box, enter `.gitlab-ci.yml`. An dropdown list appears to the right of the text box. +1. In the **Filename** text box, enter `.gitlab-ci.yml`. A dropdown list appears to the right of the text box. 1. From the **Apply a template** dropdown list, in the **Pages** section, select the name of your SSG. For plain HTML, select **HTML**. 1. In the **Commit message** box, type the commit message. -- GitLab From 897a12790f5b8ecc39e72382dd87f91ed57f2cd4 Mon Sep 17 00:00:00 2001 From: Marcin Sedlak-Jakubowski Date: Thu, 16 Oct 2025 21:53:48 +0200 Subject: [PATCH 3/8] Add anchor link --- doc/user/project/pages/getting_started/pages_from_scratch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index d3704f61c73905..9187549acb89a8 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -26,7 +26,7 @@ to complete this tutorial. If instead, you'd like to create a Pages site with plain HTML: create your site, upload it to a GitLab project, create the `.gitlab-ci.yml` file [from the `HTML` template](pages_ci_cd_template.md), -and continue with this tutorial's step 6: Deploy and view your website. +and continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). {{< /alert >}} -- GitLab From 91e30876146a81c59b1f97f722786c3a899c7291 Mon Sep 17 00:00:00 2001 From: Brendan Date: Fri, 17 Oct 2025 09:54:39 +0200 Subject: [PATCH 4/8] Update note and link to HTML tutorial --- doc/user/project/pages/getting_started/pages_from_scratch.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index 9187549acb89a8..f1b643d36f383f 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -24,9 +24,8 @@ to complete this tutorial. {{< alert type="note" >}} -If instead, you'd like to create a Pages site with plain HTML: create your site, upload it to a -GitLab project, create the `.gitlab-ci.yml` file [from the `HTML` template](pages_ci_cd_template.md), -and continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). +To create a Pages site with plain HTML, follow the [Create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) +guide, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). {{< /alert >}} -- GitLab From 2c3cc18f1808260dd45c4f081e636cb8767553a6 Mon Sep 17 00:00:00 2001 From: Brendan Date: Fri, 17 Oct 2025 09:59:03 +0200 Subject: [PATCH 5/8] Link to the list of available templates --- doc/user/project/pages/getting_started/pages_from_scratch.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index f1b643d36f383f..a556358dd1745b 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -25,7 +25,8 @@ to complete this tutorial. {{< alert type="note" >}} To create a Pages site with plain HTML, follow the [Create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) -guide, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). +tutorial, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). +For a list of available templates, see [project templates](pages_new_project_template.md#project-templates). {{< /alert >}} -- GitLab From 036c707f61ed95283457777addc29284111bc5f4 Mon Sep 17 00:00:00 2001 From: Roshni Sarangadharan Date: Fri, 17 Oct 2025 14:15:54 +0530 Subject: [PATCH 6/8] Apply 1 suggestion(s) to 1 file(s) --- doc/user/project/pages/getting_started/pages_from_scratch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index a556358dd1745b..285841021f3fd1 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -24,7 +24,7 @@ to complete this tutorial. {{< alert type="note" >}} -To create a Pages site with plain HTML, follow the [Create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) +To create a Pages site with plain HTML, see [create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) tutorial, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). For a list of available templates, see [project templates](pages_new_project_template.md#project-templates). -- GitLab From 81a925270468f5733216890ae3c39eee064820ab Mon Sep 17 00:00:00 2001 From: Roshni Sarangadharan Date: Fri, 17 Oct 2025 14:34:41 +0530 Subject: [PATCH 7/8] Apply 1 suggestion(s) to 1 file(s) --- doc/user/project/pages/getting_started/pages_from_scratch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index 285841021f3fd1..c30eb726e2d189 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -24,7 +24,7 @@ to complete this tutorial. {{< alert type="note" >}} -To create a Pages site with plain HTML, see [create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) +To create a Pages site with plain HTML, see the [create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) tutorial, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). For a list of available templates, see [project templates](pages_new_project_template.md#project-templates). -- GitLab From 95d92953aaf04f085d2e7b4ae675d479e2b31df6 Mon Sep 17 00:00:00 2001 From: Brendan Lynch Date: Thu, 23 Oct 2025 08:29:15 +0200 Subject: [PATCH 8/8] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Naman Jagdish Gala --- doc/user/project/pages/getting_started/pages_from_scratch.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/user/project/pages/getting_started/pages_from_scratch.md b/doc/user/project/pages/getting_started/pages_from_scratch.md index c30eb726e2d189..c166b61d350727 100644 --- a/doc/user/project/pages/getting_started/pages_from_scratch.md +++ b/doc/user/project/pages/getting_started/pages_from_scratch.md @@ -25,8 +25,7 @@ to complete this tutorial. {{< alert type="note" >}} To create a Pages site with plain HTML, see the [create a GitLab Pages website from a CI/CD template](pages_ci_cd_template.md) -tutorial, and then continue with this tutorial's [step 6: Deploy and view your website](#deploy-and-view-your-website). -For a list of available templates, see [project templates](pages_new_project_template.md#project-templates). +tutorial. For a list of available templates, see [project templates](pages_new_project_template.md#project-templates). {{< /alert >}} -- GitLab