diff options
| -rw-r--r-- | .gitlab/ci/docker-images.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/issue_templates/release.md | 20 | ||||
| -rw-r--r-- | content/_data/navigation.yaml | 6 | ||||
| -rw-r--r-- | content/frontend/search/search_helpers.js | 6 | ||||
| -rw-r--r-- | content/versions.json | 6 | ||||
| -rw-r--r-- | latest.Dockerfile | 2 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | yarn.lock | 26 |
8 files changed, 35 insertions, 39 deletions
diff --git a/.gitlab/ci/docker-images.gitlab-ci.yml b/.gitlab/ci/docker-images.gitlab-ci.yml index 253154dd..af0a16ae 100644 --- a/.gitlab/ci/docker-images.gitlab-ci.yml +++ b/.gitlab/ci/docker-images.gitlab-ci.yml @@ -192,7 +192,7 @@ test:image:docs-single: - .rules_docker_single_images_tests stage: test variables: - GITLAB_VERSION: '16.7' + GITLAB_VERSION: '16.8' DOCKERFILE: dockerfiles/single.Dockerfile IMAGE_NAME: $CI_REGISTRY_IMAGE:$GITLAB_VERSION NANOC_ENV: test @@ -253,7 +253,7 @@ test:image:docs-single-lunrjs: - .rules_docker_single_images_tests stage: test variables: - GITLAB_VERSION: '16.6' + GITLAB_VERSION: '16.8' IMAGE_NAME: $CI_REGISTRY_IMAGE/archives:$GITLAB_VERSION DOCKERFILE: dockerfiles/single.Dockerfile NANOC_ENV: test diff --git a/.gitlab/issue_templates/release.md b/.gitlab/issue_templates/release.md index 8513ee27..ccdddec5 100644 --- a/.gitlab/issue_templates/release.md +++ b/.gitlab/issue_templates/release.md @@ -58,18 +58,6 @@ The following terms are used throughout this document: - A new `X.Y.Dockerfile` is created and automatically committed. - The new branch is pushed. - After the branch is created, the - [`image:docs-single` job](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/7fbb5e1313ebde811877044e87f444a0a283fed4/.gitlab/ci/docker-images.gitlab-ci.yml#L107-129) - runs and creates a new Docker image tagged with the name of the stable branch - (for example, see [the 15.6 release pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines/702437095)). - When the job finishes, confirm the Docker image has been created. Go to the `registry` environment at - <https://gitlab.com/gitlab-org/gitlab-docs/-/environments/folders/registry> and confirm the image - is listed. - - In case the pipeline fails, see the [troubleshooting section](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/main/doc/releases.md#imagedocs-single-job-fails-when-creating-the-docs-stable-branch). - -You can continue onto the next process immediately, or wait for the release post. - ### On the Thursday of the release, or the day after After the release post is live, or the day after: @@ -82,7 +70,13 @@ After the release post is live, or the day after: If not, you cannot proceed to the next step, so you'll have to wait. 1. [ ] Run a new pipeline targeting the docs stable branch after all upstream - stable branches have been created. Verify that the [pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines?page=1&scope=all) for the stable branch (filter by branch) + stable branches have been created. When the pipeline runs, the + [`image:docs-single` job](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/7fbb5e1313ebde811877044e87f444a0a283fed4/.gitlab/ci/docker-images.gitlab-ci.yml#L107-129) + builds a new Docker image tagged with the name of the stable branch containing + all the versioned documentation + (for example, see [the 15.6 release pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines/702437095)). + + Verify that the [pipeline](https://gitlab.com/gitlab-org/gitlab-docs/-/pipelines?page=1&scope=all) for the stable branch (filter by branch) has passed and created a [Docker image](https://gitlab.com/gitlab-org/gitlab-docs/container_registry/631635?orderBy=NAME&sort=desc&search[]=) tagged with the release version. ([If it fails, how do I fix it?](https://gitlab.com/gitlab-org/gitlab-docs/-/blob/main/doc/releases.md#imagedocs-single-job-fails-when-creating-the-docs-stable-branch)) - To filter the list of pipelines to the stable branch, select the **Branch name** filter then manually input the stable branch's name. For example, "Branch name = 16.0". diff --git a/content/_data/navigation.yaml b/content/_data/navigation.yaml index 97768ae6..a38fd187 100644 --- a/content/_data/navigation.yaml +++ b/content/_data/navigation.yaml @@ -50,7 +50,7 @@ sections: category_url: 'ee/tutorials/secure_application.html' - category_title: Manage your infrastructure category_url: 'ee/tutorials/infrastructure.html' - - category_title: Develop with GitLab + - category_title: Extend with GitLab category_url: 'ee/tutorials/develop.html' - category_title: Find more tutorials category_url: 'ee/tutorials/more_tutorials.html' @@ -1849,6 +1849,8 @@ sections: doc_url: 'ee/ci/secrets/azure_key_vault.html' - doc_title: Use GCP Secret Manager secrets in GitLab CI/CD doc_url: 'ee/ci/secrets/gcp_secret_manager.html' + - doc_title: 'Tutorial: Use Fortanix Data Security Manager (DSM) with GitLab' + doc_url: 'ee/ci/secrets/fortanix_dsm_integration.html' - doc_title: Use Sigstore for keyless signing doc_url: 'ee/ci/yaml/signing_examples.html' - doc_title: Connect to cloud services @@ -2430,7 +2432,7 @@ sections: doc_url: 'ee/user/project/repository/code_suggestions/repository_xray.html' - category_title: Ask questions with Chat category_url: 'ee/user/gitlab_duo_chat.html' - - section_title: Develop + - section_title: Extend section_url: 'ee/api/' section_categories: - category_title: Integrations diff --git a/content/frontend/search/search_helpers.js b/content/frontend/search/search_helpers.js index a63e7a0c..09d5afbf 100644 --- a/content/frontend/search/search_helpers.js +++ b/content/frontend/search/search_helpers.js @@ -73,9 +73,9 @@ export const SEARCH_FILTERS = [ id: 'user', }, { - text: 'Developer (API) docs', - value: 'Develop', - id: 'develop', + text: 'Extension and API docs', + value: 'Extend', + id: 'extend', }, { text: 'Contributor docs', diff --git a/content/versions.json b/content/versions.json index c58df07e..9ff68714 100644 --- a/content/versions.json +++ b/content/versions.json @@ -1,8 +1,8 @@ [ { - "next": "16.8", - "current": "16.7", - "last_minor": ["16.6", "16.5"], + "next": "16.9", + "current": "16.8", + "last_minor": ["16.7", "16.6"], "last_major": ["15.11", "14.10"] } ] diff --git a/latest.Dockerfile b/latest.Dockerfile index 48787b43..517efa09 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -7,6 +7,6 @@ RUN rm -rf /usr/share/nginx/html/* # Get all the archive static HTML and put it into place # Include the versions found in 'content/versions.json' under "current" and "last_minor" +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:16.8 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:16.7 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:16.6 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:16.5 ${TARGET} ${TARGET} diff --git a/package.json b/package.json index ea4dd6b5..7a0c415f 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "dependencies": { "@gitlab/fonts": "^1.3.0", "@gitlab/svgs": "^3.75.0", - "@gitlab/ui": "^72.7.0", + "@gitlab/ui": "^72.10.0", "@popperjs/core": "^2.11.8", "bootstrap": "^4.6.1", "cheerio": "^1.0.0-rc.12", @@ -71,7 +71,7 @@ "lodash": "^4.17.21", "lodash.isequal": "^4.5.0", "lunr": "^2.3.9", - "mermaid": "^10.6.1", + "mermaid": "^10.7.0", "pikaday": "^1.8.2", "v-click-outside": "^3.2.0", "vue": "^2.7.0" @@ -1231,10 +1231,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.75.0.tgz#31e4a3ab66cab3e405c4cff1f065ee3924fe7a98" integrity sha512-TAmlxByyZcZvr/hxipfI53XLNlzpVZCf5izRdoIhR4QFHjZ56HIwQfoVCGYRNLDV8eTnO4ljNBFLZCfyipdPoQ== -"@gitlab/ui@^72.7.0": - version "72.7.0" - resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-72.7.0.tgz#67cfccb5a2282cb8bab8ccaff8ecd953f4c65b74" - integrity sha512-gRwkwbLvztNa9lD9lIvavLeXddiDetyTsO1aYv7mkBsbmIBgD9axa8IHABJo8hG5kZUlP/bCR33nbTQcPTnuBA== +"@gitlab/ui@^72.10.0": + version "72.10.0" + resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-72.10.0.tgz#fe2bd18b0d1c51f512ee3d2ff7b0737ddd3d63c7" + integrity sha512-TBfqDaloFuYyO1VQl05M9gw8Af59gF2S0ux0WDDeIrXqU/2nrMVzyKXiMj6/o1kqrL3eudG81kPPfy5npu5xoQ== dependencies: "@floating-ui/dom" "1.4.3" bootstrap-vue "2.23.1" @@ -3412,10 +3412,10 @@ electron-to-chromium@^1.4.535: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.550.tgz#8a56ff5a8597f486d2972a653b0852945fc7a9c3" integrity sha512-LfcsAzGj18xBYFM5WetwNQdqA03iLDozfCo0SWpu5G9zA5H1G/2GOiHOVnQdOrqaZ8vI8IiSgS3JMUrq930zsw== -elkjs@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.8.2.tgz#c37763c5a3e24e042e318455e0147c912a7c248e" - integrity sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ== +elkjs@^0.9.0: + version "0.9.1" + resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.1.tgz#fd1524b3f0bed72dc65ba107ae91bcf04b5582bd" + integrity sha512-JWKDyqAdltuUcyxaECtYG6H4sqysXSLeoXuGUBfRNESMTkj+w+qdb0jya8Z/WI0jVd03WQtCGhS6FOFtlhD5FQ== emittery@^0.13.1: version "0.13.1" @@ -5626,10 +5626,10 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@^10.6.1: - version "10.6.1" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.6.1.tgz#701f4160484137a417770ce757ce1887a98c00fc" - integrity sha512-Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A== +mermaid@^10.7.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.7.0.tgz#4fd5bfd60c0c5e5c42016a82905f06c4684ec53b" + integrity sha512-PsvGupPCkN1vemAAjScyw4pw34p4/0dZkSrqvAB26hUvJulOWGIwt35FZWmT9wPIi4r0QLa5X0PB4YLIGn0/YQ== dependencies: "@braintree/sanitize-url" "^6.0.1" "@types/d3-scale" "^4.0.3" @@ -5642,7 +5642,7 @@ mermaid@^10.6.1: dagre-d3-es "7.0.10" dayjs "^1.11.7" dompurify "^3.0.5" - elkjs "^0.8.2" + elkjs "^0.9.0" khroma "^2.0.0" lodash-es "^4.17.21" mdast-util-from-markdown "^1.3.0" |