Remove mention of 404 rotation

404 versions have been rotating dynamically for quite some time now.

4 files changed, 4 insertions, 7 deletions

diff --git a/.gitlab/merge_request_templates/Release.md b/.gitlab/merge_request_templates/Release.md
index c2470dda..2cfe7535 100644
--- a/.gitlab/merge_request_templates/Release.md
+++ b/.gitlab/merge_request_templates/Release.md
@@ -3,13 +3,10 @@
 ## During release
 
 1. [ ] Push the new version which will create a Docker image with the stable version:
-
    ```sh
    bundle exec rake "release:single[X.Y]"
    ```
-
 1. [ ] Edit `content/_data/versions.yaml` and rotate the versions.
-1. [ ] Edit `content/404.html` and add the old removed version to the list of redirects at the bottom of the file.
 1. [ ] Edit `dockerfiles/Dockerfile.archives` and add the new version.
 1. [ ] Edit `Dockerfile.master` and rotate the versions.
 1. [ ] \(Optional) If there are changes in the stable branches of the docs **after** the release version Docker image was created, rerun the release version pipeline.
@@ -19,12 +16,10 @@
 On the 22nd, before merging this and **right after a scheduled pipeline has run**:
 
 1. [ ] Bump the dropdown versions for all online versions:
-
    ```sh
    bundle exec rake release:dropdowns
    ```
    This will create all the needed merge requests and will set them to MWPS.
-
 1. [ ] Once all above MRs are merged, check the newly-created pipelines of the
        respective versions https://gitlab.com/gitlab-org/gitlab-docs/pipelines.
        Once they are green, it's time to merge this MR.
diff --git a/Dockerfile.master b/Dockerfile.master
index 2b238dc7..93421ee9 100644
--- a/Dockerfile.master
+++ b/Dockerfile.master
@@ -45,10 +45,10 @@ RUN rm -rf /usr/share/nginx/html/*
 
 # Get all the archive static HTML and put it into place
 # Copy the versions found in 'content/_data/versions.yaml' under online.
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.9 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.8 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.6 ${TARGET} ${TARGET}
 
 # List the two last major versions
 # Context https://gitlab.com/gitlab-org/gitlab-docs/issues/428
diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml
index b5d21e76..9751f3cd 100644
--- a/content/_data/versions.yaml
+++ b/content/_data/versions.yaml
@@ -1,12 +1,13 @@
 # The first online version should always point to the
 # current stable version.
 online:
+  - "12.10"
   - "12.9"
   - "12.8"
   - "12.7"
-  - "12.6"
 
 offline:
+  - "12.6"
   - "12.5"
   - "12.4"
   - "12.3"
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives
index 499eb641..91b4f74a 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -7,6 +7,7 @@ ENV TARGET=/usr/share/nginx/html
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 # Get all the archive static HTML and put it into place
+COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.10 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.9 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.8 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.7 ${TARGET} ${TARGET}