refactor: remove FF_ENABLE_REDIRECTS feature flag

2 files changed, 4 insertions, 14 deletions

diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go
index 10af9e35..a39e38b9 100644
--- a/internal/serving/disk/reader.go
+++ b/internal/serving/disk/reader.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -106,13 +105,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