Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-05 18:08:37 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-05 18:08:37 +0300
commit4001deba7325ebf380f0d60038107e56a3c7e2c3 (patch)
tree89af01b4676aa4be29a63e5b481f41fb91ec2320 /doc/user/project/pages
parent7e964f54ed3dd08ed528481843ba1972684335dc (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/pages')
-rw-r--r--doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md2
-rw-r--r--doc/user/project/pages/lets_encrypt_for_gitlab_pages.md11
2 files changed, 1 insertions, 12 deletions
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
index dd5e8c85757..cb22a200514 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GitLab Pages integration with Let's Encrypt **(FREE)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28996) in GitLab 12.1. For versions earlier than GitLab 12.1, see the [manual Let's Encrypt instructions](../lets_encrypt_for_gitlab_pages.md).
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/28996) in GitLab 12.1.
The GitLab Pages integration with Let's Encrypt (LE) allows you
to use LE certificates for your Pages website with custom domains
diff --git a/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md b/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md
deleted file mode 100644
index 7779f87b459..00000000000
--- a/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-redirect_to: 'custom_domains_ssl_tls_certification/lets_encrypt_integration.md'
-remove_date: '2022-03-14'
----
-
-This file was moved to [another location](custom_domains_ssl_tls_certification/lets_encrypt_integration.md).
-
-<!-- This redirect file can be deleted after <2022-03-14>. -->
-<!-- Redirects that point to other docs in the same project expire in three months. -->
-<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->