diff options
| author | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-12-14 16:32:18 +0300 |
|---|---|---|
| committer | Vladimir Shushlin <vshushlin@gitlab.com> | 2021-12-14 16:32:18 +0300 |
| commit | cc23d6ef34be2fd5e6dff719dd1eb62a51b7a82f (patch) | |
| tree | 74683f358842025dd9a46554841fa43cc2db784d /internal/serving | |
| parent | 6ffb25027003be3acd832ba21ce8099ad8c05b5a (diff) | |
| parent | dafbc536c1ff53345dc6fedccf4071d87365b107 (diff) | |
Merge branch 'remove/ff-enable-redirects' into 'master'
refactor: remove FF_ENABLE_REDIRECTS feature flag
Closes #618
See merge request gitlab-org/gitlab-pages!582
Diffstat (limited to 'internal/serving')
| -rw-r--r-- | internal/serving/disk/reader.go | 10 | ||||
| -rw-r--r-- | internal/serving/disk/serving.go | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go index 4f7d41d0..2aeeeb27 100644 --- a/internal/serving/disk/reader.go +++ b/internal/serving/disk/reader.go @@ -7,7 +7,6 @@ import ( "io" "io/fs" "net/http" - "os" "strconv" "strings" "time" @@ -104,13 +103,8 @@ func (reader *Reader) tryFile(h serving.Handler) bool { // Serve status of `_redirects` under `_redirects` // We check if the final resolved path is `_redirects` after symlink traversal if fullPath == redirects.ConfigFile { - if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { - r := redirects.ParseRedirects(ctx, root) - reader.serveRedirectsStatus(h, r) - return true - } - - h.Writer.WriteHeader(http.StatusForbidden) + r := redirects.ParseRedirects(ctx, root) + reader.serveRedirectsStatus(h, r) return true } diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go index fbcdf9f2..635498aa 100644 --- a/internal/serving/disk/serving.go +++ b/internal/serving/disk/serving.go @@ -1,8 +1,6 @@ package disk import ( - "os" - "gitlab.com/gitlab-org/gitlab-pages/internal/config" "gitlab.com/gitlab-org/gitlab-pages/internal/httperrors" "gitlab.com/gitlab-org/gitlab-pages/internal/serving" @@ -22,10 +20,8 @@ func (s *Disk) ServeFileHTTP(h serving.Handler) bool { return true } - if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { - if s.reader.tryRedirects(h) { - return true - } + if s.reader.tryRedirects(h) { + return true } return false |