diff options
| author | Evan Read <eread@gitlab.com> | 2021-07-23 07:08:33 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2021-07-23 07:08:33 +0300 |
| commit | f81bef9e94d3ac865bd39982173a10d06c65b929 (patch) | |
| tree | 9a096df89c4e16d1ab5efd7eb0ffdc205895ff64 | |
| parent | b13a6abe3ad8db6c7885f4b3cc4e84354bcf5c06 (diff) | |
| parent | 6521a972f2d7515b68488e8060a7921062bce595 (diff) | |
Merge branch 'release-14-1' into 'main'
Release 14.1
See merge request gitlab-org/gitlab-docs!1972
| -rw-r--r-- | Dockerfile.main | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile.main b/Dockerfile.main index 7cbdd2af..c085e759 100644 --- a/Dockerfile.main +++ b/Dockerfile.main @@ -49,9 +49,9 @@ RUN rm -rf /usr/share/nginx/html/* # Note: For the 14.2 release, when 13.12 is removed from this list, uncomment the # 13.2 version from "List the two last major versions" section, and remove this note. # +COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.1 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:14.0 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.12 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.11 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index f0749bc9..002cd9c8 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,9 +7,9 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "14.1" - "14.0" - "13.12" - - "13.11" # The last version before the next major release. Verify near 14.10 as there may be more 14.X versions. last_before_new_major: @@ -18,6 +18,7 @@ last_before_new_major: # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.11" - "13.10" - "13.9" - "13.8" |