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:
authorAlessio Caiazza <376774-nolith@users.noreply.gitlab.com>2021-10-01 09:54:41 +0300
committerAlessio Caiazza <376774-nolith@users.noreply.gitlab.com>2021-10-01 09:54:41 +0300
commit81e6fdba4fa75b3e882cde818c25a2a76f531de7 (patch)
tree630098af5c75e5645a1eea93910de5c4fb104e97 /internal/vfs
parentdee99f0074625c3b1dfe07aa477e159344f89ac2 (diff)
parentaa333ba6e7c58fccb090318d4a2591a3cba645c6 (diff)
Merge branch 'remove/chrootpath' into 'master'
refactor: clean up chrootPath from the httpfs package Closes #598 See merge request gitlab-org/gitlab-pages!559
Diffstat (limited to 'internal/vfs')
-rw-r--r--internal/vfs/zip/vfs.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/internal/vfs/zip/vfs.go b/internal/vfs/zip/vfs.go
index 4118dd4a..c90d7614 100644
--- a/internal/vfs/zip/vfs.go
+++ b/internal/vfs/zip/vfs.go
@@ -123,8 +123,7 @@ func (fs *zipVFS) Reconfigure(cfg *config.Config) error {
}
func (fs *zipVFS) reconfigureTransport(cfg *config.Config) error {
- // TODO: remove chrootPath from httpsfs package: https://gitlab.com/gitlab-org/gitlab-pages/-/issues/598
- fsTransport, err := httpfs.NewFileSystemPath(cfg.Zip.AllowedPaths, "")
+ fsTransport, err := httpfs.NewFileSystemPath(cfg.Zip.AllowedPaths)
if err != nil {
return err
}