Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/workhorse/internal/badgateway/roundtripper.go b/workhorse/internal/badgateway/roundtripper.go
index 86337e80f28..240a4ebc86b 100644
--- a/workhorse/internal/badgateway/roundtripper.go
+++ b/workhorse/internal/badgateway/roundtripper.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"html/template"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -60,7 +60,7 @@ func (t *roundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
 		message, contentType = developmentModeResponse(err)
 	}
 
-	injectedResponse.Body = ioutil.NopCloser(strings.NewReader(message))
+	injectedResponse.Body = io.NopCloser(strings.NewReader(message))
 	injectedResponse.Header.Set("Content-Type", contentType)
 
 	return injectedResponse, nil
diff --git a/workhorse/internal/badgateway/roundtripper_test.go b/workhorse/internal/badgateway/roundtripper_test.go
index fc7132f9bd7..b59cb8d2c5b 100644
--- a/workhorse/internal/badgateway/roundtripper_test.go
+++ b/workhorse/internal/badgateway/roundtripper_test.go
@@ -2,7 +2,7 @@ package badgateway
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -45,7 +45,7 @@ func TestErrorPage502(t *testing.T) {
 			require.NoError(t, err, "perform roundtrip")
 			defer response.Body.Close()
 
-			body, err := ioutil.ReadAll(response.Body)
+			body, err := io.ReadAll(response.Body)
 			require.NoError(t, err)
 
 			require.Equal(t, tc.contentType, response.Header.Get("content-type"), "content type")