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

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Martinez <jmartinez@gitlab.com>2021-04-15 04:12:42 +0300
committerJaime Martinez <jmartinez@gitlab.com>2021-04-15 04:12:42 +0300
commitd52a7013df920b97937e48d619f4ad47d07fb10b (patch)
treec84a8ba2c4efc968e4ca4b72fb198c77ee59dfbd
parenta54b61e68c288d6eca5ce6e48cfc7658c817233b (diff)
Update comment about chroot removaltesting-chroot-changes
-rw-r--r--internal/config/config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index 20a9ad8b..528b586a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -148,7 +148,7 @@ type ZipServing struct {
AllowedPaths []string
// TODO: this is a temporary workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/326117#note_546346101
// where daemon-inplace-chroot=true fails to serve zip archives when pages_serve_with_zip_file_protocol is enabled
- // To be removed after we roll-out zip architecture completely https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561
+ // To be removed along with chroot support https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561
ChrootPath string
}
@@ -335,7 +335,7 @@ func loadConfig() *Config {
// TODO: this is a temporary workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/326117#note_546346101
// where daemon-inplace-chroot=true fails to serve zip archives when pages_serve_with_zip_file_protocol is enabled
- // To be removed after we roll-out zip architecture completely https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561
+ // To be removed along with chroot support https://gitlab.com/gitlab-org/gitlab-pages/-/issues/561
if config.Daemon.InplaceChroot {
config.Zip.ChrootPath = *pagesRoot
}